Update integration tests to use free functions

Author: wu-hui

packages/firestore/src/config.ts

@@ -30,6 +30,8 @@ import {
   QuerySnapshot,
   Transaction,
   WriteBatch,
+  loadBundle,
+  namedQuery,
   setLogLevel
 } from './api/database';
 import { Blob } from './api/blob';
@@ -54,6 +56,8 @@ const firestoreNamespace = {
   FieldPath,
   FieldValue,
   setLogLevel,
+  loadBundle,
+  namedQuery,
   CACHE_SIZE_UNLIMITED
 };
 

packages/firestore/test/integration/api/bundle.test.ts

@@ -95,7 +95,10 @@ apiDescribe('Bundles', (persistence: boolean) => {
     return withTestDb(persistence, async db => {
       const progressEvents: firestore.LoadBundleTaskProgress[] = [];
       let completeCalled = false;
-      const task: firestore.LoadBundleTask = db.loadBundle(bundleString(db));
+      const task: firestore.LoadBundleTask = firestore.loadBundle(
+        db,
+        bundleString(db)
+      );
       task.onProgress(
         progress => {
           progressEvents.push(progress);
@@ -124,12 +127,12 @@ apiDescribe('Bundles', (persistence: boolean) => {
       let snap = await db.collection('coll-1').get({ source: 'cache' });
       verifySnapEqualsTestDocs(snap);
 
-      snap = await (await db.namedQuery('limit'))!.get({
+      snap = await (await firestore.namedQuery(db, 'limit'))!.get({
         source: 'cache'
       });
       expect(toDataArray(snap)).to.deep.equal([{ k: 'b', bar: 2 }]);
 
-      snap = await (await db.namedQuery('limit-to-last'))!.get({
+      snap = await (await firestore.namedQuery(db, 'limit-to-last'))!.get({
         source: 'cache'
       });
       expect(toDataArray(snap)).to.deep.equal([{ k: 'a', bar: 1 }]);
@@ -138,7 +141,8 @@ apiDescribe('Bundles', (persistence: boolean) => {
 
   it('load with documents and queries with promise interface', () => {
     return withTestDb(persistence, async db => {
-      const fulfillProgress: firestore.LoadBundleTaskProgress = await db.loadBundle(
+      const fulfillProgress: firestore.LoadBundleTaskProgress = await firestore.loadBundle(
+        db,
         bundleString(db)
       );
 
@@ -153,11 +157,12 @@ apiDescribe('Bundles', (persistence: boolean) => {
 
   it('load for a second time skips', () => {
     return withTestDb(persistence, async db => {
-      await db.loadBundle(bundleString(db));
+      await firestore.loadBundle(db, bundleString(db));
 
       let completeCalled = false;
       const progressEvents: firestore.LoadBundleTaskProgress[] = [];
-      const task: firestore.LoadBundleTask = db.loadBundle(
+      const task: firestore.LoadBundleTask = firestore.loadBundle(
+        db,
         encoder.encode(bundleString(db))
       );
       task.onProgress(
@@ -193,7 +198,8 @@ apiDescribe('Bundles', (persistence: boolean) => {
       db.collection('coll-1').onSnapshot(accumulator.storeEvent);
       await accumulator.awaitEvent();
 
-      const progress = await db.loadBundle(
+      const progress = await firestore.loadBundle(
+        db,
         // Testing passing in non-string bundles.
         encoder.encode(bundleString(db))
       );
@@ -204,17 +210,18 @@ apiDescribe('Bundles', (persistence: boolean) => {
       // cache can only be tested in spec tests.
       await accumulator.assertNoAdditionalEvents();
 
-      let snap = await (await db.namedQuery('limit'))!.get();
+      let snap = await (await firestore.namedQuery(db, 'limit'))!.get();
       expect(toDataArray(snap)).to.deep.equal([{ k: 'b', bar: 0 }]);
 
-      snap = await (await db.namedQuery('limit-to-last'))!.get();
+      snap = await (await firestore.namedQuery(db, 'limit-to-last'))!.get();
       expect(toDataArray(snap)).to.deep.equal([{ k: 'a', bar: 0 }]);
     });
   });
 
   it('loaded documents should not be GC-ed right away', () => {
     return withTestDb(persistence, async db => {
-      const fulfillProgress: firestore.LoadBundleTaskProgress = await db.loadBundle(
+      const fulfillProgress: firestore.LoadBundleTaskProgress = await firestore.loadBundle(
+        db,
         bundleString(db)
       );
 
@@ -235,12 +242,15 @@ apiDescribe('Bundles', (persistence: boolean) => {
   it('load with documents from other projects fails', () => {
     return withTestDb(persistence, async db => {
       return withAlternateTestDb(persistence, async otherDb => {
-        await expect(otherDb.loadBundle(bundleString(db))).to.be.rejectedWith(
-          'Tried to deserialize key from different project'
-        );
+        await expect(
+          firestore.loadBundle(otherDb, bundleString(db))
+        ).to.be.rejectedWith('Tried to deserialize key from different project');
 
         // Verify otherDb still functions, despite loaded a problematic bundle.
-        const finalProgress = await otherDb.loadBundle(bundleString(otherDb));
+        const finalProgress = await firestore.loadBundle(
+          otherDb,
+          bundleString(otherDb)
+        );
         verifySuccessProgress(finalProgress);
 
         // Read from cache. These documents do not exist in backend, so they can