Fix Integration tests against 'minified' sources (#2445)

Author: schmidt-sebastian

integration/firestore/gulpfile.js

@@ -57,7 +57,7 @@ function copyTests() {
          * differences, as well as different paths to a valid firebase_export
          */
         /import\s+firebase\s+from\s+('|")[^\1]+firebase_export\1;?/,
-        'declare var firebase;'
+        "import * as firebase from 'firebase';"
       )
     )
     .pipe(

packages/firestore/src/api/credentials.ts

@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-import { _FirebaseApp } from '@firebase/app-types/private';
 import { User } from '../auth/user';
 import { assert } from '../util/assert';
 import { Code, FirestoreError } from '../util/error';

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

@@ -25,8 +25,9 @@ import * as integrationHelpers from '../util/helpers';
 // tslint:disable:no-floating-promises
 
 const apiDescribe = integrationHelpers.apiDescribe;
-const Timestamp = firebase.firestore!.Timestamp;
+const FieldPath = firebase.firestore!.FieldPath;
 const FieldValue = firebase.firestore!.FieldValue;
+const Timestamp = firebase.firestore!.Timestamp;
 
 apiDescribe('Database batch writes', (persistence: boolean) => {
   it('supports empty batches', () => {
@@ -108,13 +109,7 @@ apiDescribe('Database batch writes', (persistence: boolean) => {
       return doc.firestore
         .batch()
         .set(doc, initialData)
-        .update(
-          doc,
-          'owner.name',
-          'Sebastian',
-          new firebase.firestore!.FieldPath('is.admin'),
-          true
-        )
+        .update(doc, 'owner.name', 'Sebastian', new FieldPath('is.admin'), true)
         .commit()
         .then(() => doc.get())
         .then(docSnapshot => {

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

@@ -20,10 +20,6 @@ import * as chaiAsPromised from 'chai-as-promised';
 import * as firestore from '@firebase/firestore-types';
 import { expect, use } from 'chai';
 
-import { SimpleDb } from '../../../src/local/simple_db';
-import { fail } from '../../../src/util/assert';
-import { Code } from '../../../src/util/error';
-import { query } from '../../util/api_helpers';
 import { Deferred } from '../../util/promise';
 import { EventsAccumulator } from '../util/events_accumulator';
 import firebase from '../util/firebase_export';
@@ -34,16 +30,15 @@ import {
   withTestDbs,
   withTestDoc,
   withTestDocAndInitialData,
-  DEFAULT_SETTINGS,
-  withMockCredentialProviderTestDb
+  DEFAULT_SETTINGS
 } from '../util/helpers';
-import { User } from '../../../src/auth/user';
 
 // tslint:disable:no-floating-promises
 
 use(chaiAsPromised);
 
 const Timestamp = firebase.firestore!.Timestamp;
+const FieldPath = firebase.firestore!.FieldPath;
 const FieldValue = firebase.firestore!.FieldValue;
 
 apiDescribe('Database', (persistence: boolean) => {
@@ -134,8 +129,10 @@ apiDescribe('Database', (persistence: boolean) => {
         .get({ source: 'cache' })
         .then(doc => expect(doc.exists).to.be.true);
       await readerRef.get({ source: 'cache' }).then(
-        () => fail('Expected cache miss'),
-        err => expect(err.code).to.be.equal(Code.UNAVAILABLE)
+        () => {
+          expect.fail('Expected cache miss');
+        },
+        err => expect(err.code).to.be.equal('unavailable')
       );
       await writerRef
         .get()
@@ -488,8 +485,6 @@ apiDescribe('Database', (persistence: boolean) => {
   });
 
   it('can update nested fields', () => {
-    const FieldPath = firebase.firestore!.FieldPath;
-
     return withTestDoc(persistence, doc => {
       const initialData = {
         desc: 'Description',
@@ -818,7 +813,8 @@ apiDescribe('Database', (persistence: boolean) => {
   // have security rules support or something?
   // eslint-disable-next-line no-restricted-properties
   describe.skip('Listens are rejected remotely:', () => {
-    const queryForRejection = query('foo');
+    //eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const queryForRejection : firestore.Query = null as any;
 
     it('will reject listens', () => {
       const deferred = new Deferred();
@@ -856,7 +852,7 @@ apiDescribe('Database', (persistence: boolean) => {
     it('will reject gets', () => {
       return queryForRejection.get().then(
         () => {
-          throw new Error('Promise resolved even though error was expected.');
+          expect.fail('Promise resolved even though error was expected.');
         },
         err => {
           expect(err.name).to.exist;
@@ -870,7 +866,7 @@ apiDescribe('Database', (persistence: boolean) => {
         .get()
         .then(
           () => {
-            throw new Error('Promise resolved even though error was expected.');
+            expect.fail('Promise resolved even though error was expected.');
           },
           err => {
             expect(err.name).to.exist;
@@ -880,7 +876,7 @@ apiDescribe('Database', (persistence: boolean) => {
         .then(() => queryForRejection.get())
         .then(
           () => {
-            throw new Error('Promise resolved even though error was expected.');
+            expect.fail('Promise resolved even though error was expected.');
           },
           err => {
             expect(err.name).to.exist;
@@ -1051,28 +1047,6 @@ apiDescribe('Database', (persistence: boolean) => {
     }
   );
 
-  // eslint-disable-next-line no-restricted-properties
-  (persistence ? it : it.skip)(
-    'will reject the promise if clear persistence fails',
-    async () => {
-      await withTestDoc(persistence, async docRef => {
-        const oldDelete = SimpleDb.delete;
-        try {
-          SimpleDb.delete = (name: string): Promise<void> => {
-            return Promise.reject('Failed to delete the database.');
-          };
-          const firestore = docRef.firestore;
-          await firestore.app.delete();
-          await expect(
-            firestore.clearPersistence()
-          ).to.eventually.be.rejectedWith('Failed to delete the database.');
-        } finally {
-          SimpleDb.delete = oldDelete;
-        }
-      });
-    }
-  );
-
   it('can not clear persistence if the client has been initialized', async () => {
     await withTestDoc(persistence, async docRef => {
       const firestore = docRef.firestore;
@@ -1199,25 +1173,6 @@ apiDescribe('Database', (persistence: boolean) => {
     });
   });
 
-  it('waiting for pending writes should fail when user changes', async () => {
-    await withMockCredentialProviderTestDb(
-      persistence,
-      async (db, mockCredentialsProvider) => {
-        // Prevent pending writes receiving acknowledgement.
-        await db.disableNetwork();
-        // eslint-disable-next-line @typescript-eslint/no-floating-promises
-        db.doc('abc/123').set({ foo: 'bar' });
-        const awaitPendingWrite = db.waitForPendingWrites();
-
-        mockCredentialsProvider.triggerUserChange(new User('user_1'));
-
-        await expect(awaitPendingWrite).to.be.eventually.rejectedWith(
-          "'waitForPendingWrites' promise is rejected due to a user change."
-        );
-      }
-    );
-  });
-
   it('waiting for pending writes resolves immediately when offline and no pending writes', async () => {
     await withTestDoc(persistence, async docRef => {
       const firestore = docRef.firestore;

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

@@ -16,7 +16,6 @@
  */
 
 import { expect } from 'chai';
-import { LogLevel, getLogLevel, setLogLevel } from '../../../src/util/log';
 import firebase from '../util/firebase_export';
 import {
   apiDescribe,
@@ -354,18 +353,12 @@ apiDescribe('Timestamp Fields in snapshots', (persistence: boolean) => {
   };
 
   it('are returned as native dates if timestampsInSnapshots set to false', () => {
-    // Avoid the verbose log message triggered by timestampsInSnapshots ==
-    // false.
-    const logLevel = getLogLevel();
-    setLogLevel(LogLevel.SILENT);
-
     const settings = { ...DEFAULT_SETTINGS };
     settings['timestampsInSnapshots'] = false;
 
     const timestamp = new Timestamp(100, 123456789);
     const testDocs = { a: testDataWithTimestamps(timestamp) };
     return withTestCollectionSettings(persistence, settings, testDocs, coll => {
-      setLogLevel(logLevel);
       return coll
         .doc('a')
         .get()
@@ -420,17 +413,13 @@ apiDescribe('Timestamp Fields in snapshots', (persistence: boolean) => {
   });
 
   it('timestampsInSnapshots affects server timestamps', () => {
-    const logLevel = getLogLevel();
-    setLogLevel(LogLevel.SILENT);
-
     const settings = { ...DEFAULT_SETTINGS };
     settings['timestampsInSnapshots'] = false;
     const testDocs = {
       a: { timestamp: FieldValue.serverTimestamp() }
     };
 
     return withTestCollectionSettings(persistence, settings, testDocs, coll => {
-      setLogLevel(logLevel);
       return coll
         .doc('a')
         .get()

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

@@ -18,9 +18,7 @@
 import * as firestore from '@firebase/firestore-types';
 import { expect } from 'chai';
 
-import { querySnapshot } from '../../util/api_helpers';
 import { addEqualityMatcher } from '../../util/equality_matcher';
-import { keys } from '../../util/helpers';
 import { Deferred } from '../../util/promise';
 import { EventsAccumulator } from '../util/events_accumulator';
 import firebase from '../util/firebase_export';
@@ -787,18 +785,19 @@ apiDescribe('Queries', (persistence: boolean) => {
   });
 
   it('throws custom error when using docChanges as property', () => {
-    const querySnap = querySnapshot('foo/bar', {}, {}, keys(), false, false);
-
-    const expectedError =
-      'QuerySnapshot.docChanges has been changed from a property into a method';
-    // We are testing invalid API usage.
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const docChange = querySnap.docChanges as any;
-    expect(() => docChange.length).to.throw(expectedError);
-    expect(() => {
-      for (const _ of docChange) {
-      }
-    }).to.throw(expectedError);
+    return withTestCollection(persistence, {}, async coll => {
+      const snapshot = await coll.get();
+      const expectedError =
+        'QuerySnapshot.docChanges has been changed from a property into a method';
+      // We are testing invalid API usage.
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      const docChange = snapshot.docChanges as any;
+      expect(() => docChange.length).to.throw(expectedError);
+      expect(() => {
+        for (const _ of docChange) {
+        }
+      }).to.throw(expectedError);
+    });
   });
 
   it('can query collection groups', async () => {