undo not required changes

Author: tom-andersen

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

@@ -202,10 +202,7 @@ apiDescribe('Bundles', persistence => {
       await setDoc(doc(db, 'coll-1/b'), { k: 'b', bar: 0 });
 
       const accumulator = new EventsAccumulator<QuerySnapshot>();
-      const unsubscribe = onSnapshot(
-        collection(db, 'coll-1'),
-        accumulator.storeEvent
-      );
+      onSnapshot(collection(db, 'coll-1'), accumulator.storeEvent);
       await accumulator.awaitEvent();
 
       const progress = await loadBundle(
@@ -219,7 +216,6 @@ apiDescribe('Bundles', persistence => {
       // generated as a result. The case where a bundle has newer doc than
       // cache can only be tested in spec tests.
       await accumulator.assertNoAdditionalEvents();
-      unsubscribe();
 
       let snap = await getDocs((await namedQuery(db, 'limit'))!);
       expect(toDataArray(snap)).to.deep.equal([{ k: 'b', bar: 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');
 
-      const unsubscribe1 = onSnapshot(docA, snap => {
+      onSnapshot(docA, snap => {
         events.push('doc');
         gotInitialSnapshot.resolve();
       });
       await gotInitialSnapshot.promise;
       events = [];
 
       const done = new Deferred<void>();
-      const unsubscribe2 = onSnapshotsInSync(db, () => {
+      onSnapshotsInSync(db, () => {
         events.push('snapshots-in-sync');
         if (events.length === 3) {
           // We should have an initial snapshots-in-sync event, then a snapshot
@@ -865,8 +865,6 @@ apiDescribe('Database', persistence => {
 
       await setDoc(docA, { foo: 3 });
       await done.promise;
-      unsubscribe1();
-      unsubscribe2();
     });
   });
 
@@ -1087,29 +1085,24 @@ apiDescribe('Database', persistence => {
   });
 
   it('DocumentSnapshot events for nonexistent document', () => {
-    return withTestCollection(persistence, {}, async col => {
+    return withTestCollection(persistence, {}, col => {
       const docA = doc(col);
       const storeEvent = new EventsAccumulator<DocumentSnapshot>();
-      const unsubscribe = onSnapshot(docA, storeEvent.storeEvent);
-      await storeEvent.awaitEvent().then(snap => {
+      onSnapshot(docA, storeEvent.storeEvent);
+      return 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, {}, async col => {
+    return withTestCollection(persistence, {}, col => {
       const docA = doc(col);
       const storeEvent = new EventsAccumulator<DocumentSnapshot>();
-      const unsubscribe = onSnapshot(
-        docA,
-        { includeMetadataChanges: true },
-        storeEvent.storeEvent
-      );
-      await storeEvent
+      onSnapshot(docA, { includeMetadataChanges: true }, storeEvent.storeEvent);
+      return storeEvent
         .awaitEvent()
         .then(snap => {
           expect(snap.exists()).to.be.false;
@@ -1131,7 +1124,6 @@ apiDescribe('Database', persistence => {
           // TODO(b/295872012): Figure out a way to check for all scenarios.
           // expect(snap.metadata.hasPendingWrites).to.be.false;
         });
-      unsubscribe();
     });
   });
 

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

@@ -234,8 +234,8 @@ apiDescribe('Validation:', persistence => {
     validationIt(
       persistence,
       'disallows calling enableIndexedDbPersistence() after use',
-      async db => {
-        await getDoc(doc(db, 'foo/bar'));
+      db => {
+        //doc(db, 'foo/bar');
         expect(() => enableIndexedDbPersistence(db)).to.throw(
           'Firestore has already been started and persistence can no ' +
             'longer be enabled. You can only enable persistence before ' +