remove explicit type from persistence argument

Author: dconeybe

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

@@ -42,7 +42,7 @@ addEqualityMatcher();
  * together, etc.) and so these tests mostly focus on the array transform
  * semantics.
  */
-apiDescribe('Array Transforms:', (persistence: boolean) => {
+apiDescribe('Array Transforms:', persistence => {
   // A document reference to read and write to.
   let docRef: DocumentReference;
 
@@ -164,76 +164,79 @@ apiDescribe('Array Transforms:', (persistence: boolean) => {
    * being enabled so documents remain in the cache after the write.
    */
   // eslint-disable-next-line no-restricted-properties
-  (persistence ? describe : describe.skip)('Server Application: ', () => {
-    it('set() with no cached base doc', async () => {
-      await withTestDoc(persistence, async docRef => {
-        await setDoc(docRef, { array: arrayUnion(1, 2) });
-        const snapshot = await getDocFromCache(docRef);
-        expect(snapshot.data()).to.deep.equal({ array: [1, 2] });
-      });
-    });
-
-    it('update() with no cached base doc', async () => {
-      let path: string | null = null;
-      // Write an initial document in an isolated Firestore instance so it's not
-      // stored in our cache
-      await withTestDoc(persistence, async docRef => {
-        path = docRef.path;
-        await setDoc(docRef, { array: [42] });
+  (persistence ? describe : describe.skip)(
+    'Server Application: ',
+    () => {
+      it('set() with no cached base doc', async () => {
+        await withTestDoc(persistence, async docRef => {
+          await setDoc(docRef, { array: arrayUnion(1, 2) });
+          const snapshot = await getDocFromCache(docRef);
+          expect(snapshot.data()).to.deep.equal({ array: [1, 2] });
+        });
       });
 
-      await withTestDb(persistence, async db => {
-        const docRef = doc(db, path!);
-        await updateDoc(docRef, { array: arrayUnion(1, 2) });
-
-        // Nothing should be cached since it was an update and we had no base
-        // doc.
-        let errCaught = false;
-        try {
-          await getDocFromCache(docRef);
-        } catch (err) {
-          expect((err as FirestoreError).code).to.equal('unavailable');
-          errCaught = true;
-        }
-        expect(errCaught).to.be.true;
+      it('update() with no cached base doc', async () => {
+        let path: string | null = null;
+        // Write an initial document in an isolated Firestore instance so it's not
+        // stored in our cache
+        await withTestDoc(persistence, async docRef => {
+          path = docRef.path;
+          await setDoc(docRef, { array: [42] });
+        });
+
+        await withTestDb(persistence, async db => {
+          const docRef = doc(db, path!);
+          await updateDoc(docRef, { array: arrayUnion(1, 2) });
+
+          // Nothing should be cached since it was an update and we had no base
+          // doc.
+          let errCaught = false;
+          try {
+            await getDocFromCache(docRef);
+          } catch (err) {
+            expect((err as FirestoreError).code).to.equal('unavailable');
+            errCaught = true;
+          }
+          expect(errCaught).to.be.true;
+        });
       });
-    });
 
-    it('set(..., {merge}) with no cached based doc', async () => {
-      let path: string | null = null;
-      // Write an initial document in an isolated Firestore instance so it's not
-      // stored in our cache
-      await withTestDoc(persistence, async docRef => {
-        path = docRef.path;
-        await setDoc(docRef, { array: [42] });
+      it('set(..., {merge}) with no cached based doc', async () => {
+        let path: string | null = null;
+        // Write an initial document in an isolated Firestore instance so it's not
+        // stored in our cache
+        await withTestDoc(persistence, async docRef => {
+          path = docRef.path;
+          await setDoc(docRef, { array: [42] });
+        });
+
+        await withTestDb(persistence, async db => {
+          const docRef = doc(db, path!);
+          await setDoc(docRef, { array: arrayUnion(1, 2) }, { merge: true });
+
+          // Document will be cached but we'll be missing 42.
+          const snapshot = await getDocFromCache(docRef);
+          expect(snapshot.data()).to.deep.equal({ array: [1, 2] });
+        });
       });
 
-      await withTestDb(persistence, async db => {
-        const docRef = doc(db, path!);
-        await setDoc(docRef, { array: arrayUnion(1, 2) }, { merge: true });
-
-        // Document will be cached but we'll be missing 42.
-        const snapshot = await getDocFromCache(docRef);
-        expect(snapshot.data()).to.deep.equal({ array: [1, 2] });
+      it('update() with cached base doc using arrayUnion()', async () => {
+        await withTestDoc(persistence, async docRef => {
+          await setDoc(docRef, { array: [42] });
+          await updateDoc(docRef, { array: arrayUnion(1, 2) });
+          const snapshot = await getDocFromCache(docRef);
+          expect(snapshot.data()).to.deep.equal({ array: [42, 1, 2] });
+        });
       });
-    });
 
-    it('update() with cached base doc using arrayUnion()', async () => {
-      await withTestDoc(persistence, async docRef => {
-        await setDoc(docRef, { array: [42] });
-        await updateDoc(docRef, { array: arrayUnion(1, 2) });
-        const snapshot = await getDocFromCache(docRef);
-        expect(snapshot.data()).to.deep.equal({ array: [42, 1, 2] });
+      it('update() with cached base doc using arrayRemove()', async () => {
+        await withTestDoc(persistence, async docRef => {
+          await setDoc(docRef, { array: [42, 1, 2] });
+          await updateDoc(docRef, { array: arrayRemove(1, 2) });
+          const snapshot = await getDocFromCache(docRef);
+          expect(snapshot.data()).to.deep.equal({ array: [42] });
+        });
       });
-    });
-
-    it('update() with cached base doc using arrayRemove()', async () => {
-      await withTestDoc(persistence, async docRef => {
-        await setDoc(docRef, { array: [42, 1, 2] });
-        await updateDoc(docRef, { array: arrayRemove(1, 2) });
-        const snapshot = await getDocFromCache(docRef);
-        expect(snapshot.data()).to.deep.equal({ array: [42] });
-      });
-    });
-  });
+    }
+  );
 });

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

@@ -41,7 +41,7 @@ import {
   withTestDoc
 } from '../util/helpers';
 
-apiDescribe('Database batch writes', (persistence: boolean) => {
+apiDescribe('Database batch writes', persistence => {
   it('supports empty batches', () => {
     return withTestDb(persistence, db => {
       return writeBatch(db).commit();
@@ -329,7 +329,7 @@ apiDescribe('Database batch writes', (persistence: boolean) => {
 
   // PORTING NOTE: These tests are for FirestoreDataConverter support and apply
   // only to web.
-  apiDescribe('withConverter() support', (persistence: boolean) => {
+  apiDescribe('withConverter() support', persistence => {
     class Post {
       constructor(readonly title: string, readonly author: string) {}
       byline(): string {

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

@@ -69,7 +69,7 @@ const BUNDLE_TEMPLATE = [
   '{"document":{"name":"projects/{0}/databases/(default)/documents/coll-1/b","createTime":{"seconds":1,"nanos":9},"updateTime":{"seconds":1,"nanos":9},"fields":{"k":{"stringValue":"b"},"bar":{"integerValue":2}}}}'
 ];
 
-apiDescribe('Bundles', (persistence: boolean) => {
+apiDescribe('Bundles', persistence => {
   function verifySnapEqualsTestDocs(snap: QuerySnapshot): void {
     expect(toDataArray(snap)).to.deep.equal([
       { k: 'a', bar: 1 },

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

@@ -44,7 +44,7 @@ import {
   withTestDbs
 } from '../util/helpers';
 
-apiDescribe('Cursors', (persistence: boolean) => {
+apiDescribe('Cursors', persistence => {
   it('can page through items', () => {
     const testDocs = {
       a: { v: 'a' },

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

@@ -81,7 +81,7 @@ import { DEFAULT_SETTINGS, DEFAULT_PROJECT_ID } from '../util/settings';
 
 use(chaiAsPromised);
 
-apiDescribe('Database', (persistence: boolean) => {
+apiDescribe('Database', persistence => {
   it('can set a document', () => {
     return withTestDoc(persistence, docRef => {
       return setDoc(docRef, {
@@ -638,7 +638,7 @@ apiDescribe('Database', (persistence: boolean) => {
     });
   });
 
-  apiDescribe('Queries are validated client-side', (persistence: boolean) => {
+  apiDescribe('Queries are validated client-side', persistence => {
     // NOTE: Failure cases are validated in validation_test.ts
 
     it('same inequality fields works', () => {
@@ -1340,7 +1340,7 @@ apiDescribe('Database', (persistence: boolean) => {
 
   // PORTING NOTE: These tests are for FirestoreDataConverter support and apply
   // only to web.
-  apiDescribe('withConverter() support', (persistence: boolean) => {
+  apiDescribe('withConverter() support', persistence => {
     class Post {
       constructor(
         readonly title: string,

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

@@ -43,7 +43,7 @@ import { DEFAULT_SETTINGS } from '../util/settings';
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 type AnyTestData = any;
 
-apiDescribe('Nested Fields', (persistence: boolean) => {
+apiDescribe('Nested Fields', persistence => {
   const testData = (n?: number): AnyTestData => {
     n = n || 1;
     return {
@@ -240,7 +240,7 @@ apiDescribe('Nested Fields', (persistence: boolean) => {
 // NOTE(mikelehen): I originally combined these tests with the above ones, but
 // Datastore currently prohibits having nested fields and fields with dots in
 // the same entity, so I'm separating them.
-apiDescribe('Fields with special characters', (persistence: boolean) => {
+apiDescribe('Fields with special characters', persistence => {
   const testData = (n?: number): AnyTestData => {
     n = n || 1;
     return {
@@ -340,7 +340,7 @@ apiDescribe('Fields with special characters', (persistence: boolean) => {
   });
 });
 
-apiDescribe('Timestamp Fields in snapshots', (persistence: boolean) => {
+apiDescribe('Timestamp Fields in snapshots', persistence => {
   // Figure out how to pass in the Timestamp type
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const testDataWithTimestamps = (ts: any): AnyTestData => {
@@ -379,7 +379,7 @@ apiDescribe('Timestamp Fields in snapshots', (persistence: boolean) => {
   });
 });
 
-apiDescribe('`undefined` properties', (persistence: boolean) => {
+apiDescribe('`undefined` properties', persistence => {
   const settings = { ...DEFAULT_SETTINGS };
   settings.ignoreUndefinedProperties = true;
 

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

@@ -39,7 +39,7 @@ import {
   withEnsuredLruGcTestDb
 } from '../util/helpers';
 
-apiDescribe('GetOptions', (persistence: boolean) => {
+apiDescribe('GetOptions', persistence => {
   it('get document while online with default get options', () => {
     const initialData = { key: 'value' };
     return withTestDocAndInitialData(persistence, initialData, docRef => {

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

@@ -20,7 +20,7 @@ import { expect } from 'chai';
 import { setIndexConfiguration } from '../util/firebase_export';
 import { apiDescribe, withTestDb } from '../util/helpers';
 
-apiDescribe('Index Configuration:', (persistence: boolean) => {
+apiDescribe('Index Configuration:', persistence => {
   it('supports JSON', () => {
     return withTestDb(persistence, async db => {
       return setIndexConfiguration(

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

@@ -37,7 +37,7 @@ import { apiDescribe, withTestDoc } from '../util/helpers';
 
 const DOUBLE_EPSILON = 0.000001;
 
-apiDescribe('Numeric Transforms:', (persistence: boolean) => {
+apiDescribe('Numeric Transforms:', persistence => {
   // A document reference to read and write to.
   let docRef: DocumentReference;
 

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

@@ -70,7 +70,7 @@ import {
 import { USE_EMULATOR } from '../util/settings';
 import { captureExistenceFilterMismatches } from '../util/testing_hooks_util';
 
-apiDescribe('Queries', (persistence: boolean) => {
+apiDescribe('Queries', persistence => {
   addEqualityMatcher();
 
   it('can issue limit queries', () => {
@@ -2027,42 +2027,45 @@ apiDescribe('Queries', (persistence: boolean) => {
 
   // Reproduces https://github.com/firebase/firebase-js-sdk/issues/5873
   // eslint-disable-next-line no-restricted-properties
-  (persistence ? describe : describe.skip)('Caching empty results', () => {
-    it('can raise initial snapshot from cache, even if it is empty', () => {
-      return withTestCollection(persistence, {}, async coll => {
-        const snapshot1 = await getDocs(coll); // Populate the cache.
-        expect(snapshot1.metadata.fromCache).to.be.false;
-        expect(toDataArray(snapshot1)).to.deep.equal([]); // Precondition check.
-
-        // Add a snapshot listener whose first event should be raised from cache.
-        const storeEvent = new EventsAccumulator<QuerySnapshot>();
-        onSnapshot(coll, storeEvent.storeEvent);
-        const snapshot2 = await storeEvent.awaitEvent();
-        expect(snapshot2.metadata.fromCache).to.be.true;
-        expect(toDataArray(snapshot2)).to.deep.equal([]);
+  (persistence ? describe : describe.skip)(
+    'Caching empty results',
+    () => {
+      it('can raise initial snapshot from cache, even if it is empty', () => {
+        return withTestCollection(persistence, {}, async coll => {
+          const snapshot1 = await getDocs(coll); // Populate the cache.
+          expect(snapshot1.metadata.fromCache).to.be.false;
+          expect(toDataArray(snapshot1)).to.deep.equal([]); // Precondition check.
+
+          // Add a snapshot listener whose first event should be raised from cache.
+          const storeEvent = new EventsAccumulator<QuerySnapshot>();
+          onSnapshot(coll, storeEvent.storeEvent);
+          const snapshot2 = await storeEvent.awaitEvent();
+          expect(snapshot2.metadata.fromCache).to.be.true;
+          expect(toDataArray(snapshot2)).to.deep.equal([]);
+        });
       });
-    });
 
-    it('can raise initial snapshot from cache, even if it has become empty', () => {
-      const testDocs = {
-        a: { key: 'a' }
-      };
-      return withTestCollection(persistence, testDocs, async coll => {
-        // Populate the cache.
-        const snapshot1 = await getDocs(coll);
-        expect(snapshot1.metadata.fromCache).to.be.false;
-        expect(toDataArray(snapshot1)).to.deep.equal([{ key: 'a' }]);
-        // Empty the collection.
-        void deleteDoc(doc(coll, 'a'));
-
-        const storeEvent = new EventsAccumulator<QuerySnapshot>();
-        onSnapshot(coll, storeEvent.storeEvent);
-        const snapshot2 = await storeEvent.awaitEvent();
-        expect(snapshot2.metadata.fromCache).to.be.true;
-        expect(toDataArray(snapshot2)).to.deep.equal([]);
+      it('can raise initial snapshot from cache, even if it has become empty', () => {
+        const testDocs = {
+          a: { key: 'a' }
+        };
+        return withTestCollection(persistence, testDocs, async coll => {
+          // Populate the cache.
+          const snapshot1 = await getDocs(coll);
+          expect(snapshot1.metadata.fromCache).to.be.false;
+          expect(toDataArray(snapshot1)).to.deep.equal([{ key: 'a' }]);
+          // Empty the collection.
+          void deleteDoc(doc(coll, 'a'));
+
+          const storeEvent = new EventsAccumulator<QuerySnapshot>();
+          onSnapshot(coll, storeEvent.storeEvent);
+          const snapshot2 = await storeEvent.awaitEvent();
+          expect(snapshot2.metadata.fromCache).to.be.true;
+          expect(toDataArray(snapshot2)).to.deep.equal([]);
+        });
       });
-    });
-  });
+    }
+  );
 
   it('resuming a query should use bloom filter to avoid full requery', async () => {
     // Prepare the names and contents of the 100 documents to create.

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

@@ -38,7 +38,7 @@ import { apiDescribe, withTestDoc } from '../util/helpers';
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 type AnyTestData = any;
 
-apiDescribe('Server Timestamps', (persistence: boolean) => {
+apiDescribe('Server Timestamps', persistence => {
   // Data written in tests via set().
   const setData = {
     a: 42,

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

@@ -40,7 +40,7 @@ import {
   withTestDoc
 } from '../util/helpers';
 
-apiDescribe('Smoke Test', (persistence: boolean) => {
+apiDescribe('Smoke Test', persistence => {
   it('can write a single document', () => {
     return withTestDoc(persistence, ref => {
       return setDoc(ref, {