Fix

Author: tom-andersen

packages/firestore-compat/test/bundle.test.ts

@@ -188,7 +188,7 @@ apiDescribe('Bundles', (persistence: boolean) => {
       await db.doc('coll-1/b').set({ k: 'b', bar: 0 });
 
       const accumulator = new EventsAccumulator<firestore.QuerySnapshot>();
-      db.collection('coll-1').onSnapshot(accumulator.storeEvent);
+      const unsubscribe = db.collection('coll-1').onSnapshot(accumulator.storeEvent);
       await accumulator.awaitEvent();
 
       const progress = await db.loadBundle(
@@ -207,6 +207,8 @@ apiDescribe('Bundles', (persistence: boolean) => {
 
       snap = await (await db.namedQuery('limit-to-last'))!.get();
       expect(toDataArray(snap)).to.deep.equal([{ k: 'a', bar: 0 }]);
+
+      unsubscribe();
     });
   });
 

packages/firestore-compat/test/get_options.test.ts

@@ -55,11 +55,11 @@ apiDescribe('GetOptions', (persistence: boolean) => {
 
   it('get document while offline with default get options', () => {
     const initialData = { key: 'value' };
-    return withTestDocAndInitialData(persistence, initialData, docRef => {
+    return withTestDocAndInitialData(persistence, initialData, async docRef => {
       // Register a snapshot to force the data to stay in the cache and not be
       // garbage collected.
-      docRef.onSnapshot(() => {});
-      return docRef
+      const unsubscribe = docRef.onSnapshot(() => {});
+      await docRef
         .get()
         .then(ignored => docRef.firestore.disableNetwork())
         .then(() => docRef.get())
@@ -69,6 +69,7 @@ apiDescribe('GetOptions', (persistence: boolean) => {
           expect(doc.metadata.hasPendingWrites).to.be.false;
           expect(doc.data()).to.deep.equal(initialData);
         });
+      unsubscribe();
     });
   });
 

packages/firestore/src/util/async_observer.ts

@@ -36,12 +36,14 @@ export class AsyncObserver<T> implements Observer<T> {
   constructor(private observer: Partial<Observer<T>>) {}
 
   next(value: T): void {
+    if (this.muted) return;
     if (this.observer.next) {
       this.scheduleEvent(this.observer.next, value);
     }
   }
 
   error(error: FirestoreError): void {
+    if (this.muted) return;
     if (this.observer.error) {
       this.scheduleEvent(this.observer.error, error);
     } else {
@@ -54,12 +56,10 @@ export class AsyncObserver<T> implements Observer<T> {
   }
 
   private scheduleEvent<E>(eventHandler: EventHandler<E>, event: E): void {
-    if (!this.muted) {
-      setTimeout(() => {
-        if (!this.muted) {
-          eventHandler(event);
-        }
-      }, 0);
-    }
+    setTimeout(() => {
+      if (!this.muted) {
+        eventHandler(event);
+      }
+    }, 0);
   }
 }

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

@@ -840,15 +840,15 @@ apiDescribe('Database', persistence => {
       const gotInitialSnapshot = new Deferred<void>();
       const docA = doc(coll, 'a');
 
-      onSnapshot(docA, snap => {
+      const unsubscribe1 = onSnapshot(docA, snap => {
         events.push('doc');
         gotInitialSnapshot.resolve();
       });
       await gotInitialSnapshot.promise;
       events = [];
 
       const done = new Deferred<void>();
-      onSnapshotsInSync(db, () => {
+      const unsubscribe2 = onSnapshotsInSync(db, () => {
         events.push('snapshots-in-sync');
         if (events.length === 3) {
           // We should have an initial snapshots-in-sync event, then a snapshot
@@ -865,6 +865,8 @@ apiDescribe('Database', persistence => {
 
       await setDoc(docA, { foo: 3 });
       await done.promise;
+      unsubscribe1();
+      unsubscribe2();
     });
   });
 
@@ -1085,24 +1087,25 @@ apiDescribe('Database', persistence => {
   });
 
   it('DocumentSnapshot events for nonexistent document', () => {
-    return withTestCollection(persistence, {}, col => {
+    return withTestCollection(persistence, {}, async col => {
       const docA = doc(col);
       const storeEvent = new EventsAccumulator<DocumentSnapshot>();
-      onSnapshot(docA, storeEvent.storeEvent);
-      return storeEvent.awaitEvent().then(snap => {
+      const unsubscribe = onSnapshot(docA, storeEvent.storeEvent);
+      await storeEvent.awaitEvent().then(snap => {
         expect(snap.exists()).to.be.false;
         expect(snap.data()).to.equal(undefined);
-        return storeEvent.assertNoAdditionalEvents();
       });
+      await storeEvent.assertNoAdditionalEvents();
+      unsubscribe()
     });
   });
 
   it('DocumentSnapshot events for add data to document', () => {
-    return withTestCollection(persistence, {}, col => {
+    return withTestCollection(persistence, {}, async col => {
       const docA = doc(col);
       const storeEvent = new EventsAccumulator<DocumentSnapshot>();
-      onSnapshot(docA, { includeMetadataChanges: true }, storeEvent.storeEvent);
-      return storeEvent
+      const unsubscribe = onSnapshot(docA, { includeMetadataChanges: true }, storeEvent.storeEvent);
+      await storeEvent
         .awaitEvent()
         .then(snap => {
           expect(snap.exists()).to.be.false;
@@ -1124,6 +1127,7 @@ apiDescribe('Database', persistence => {
           // TODO(b/295872012): Figure out a way to check for all scenarios.
           // expect(snap.metadata.hasPendingWrites).to.be.false;
         });
+      unsubscribe();
     });
   });