Cleanup

Author: schmidt-sebastian

packages/firestore/src/remote/persistent_stream.ts

@@ -255,7 +255,7 @@ export abstract class PersistentStream<
         return this.handleIdleCloseTimer();
       }, IDLE_TIMEOUT_MS)
       .catch((err: FirestoreError) => {
-        // When the AsyncQueue gets drained during a shutdown, pending Promises
+        // When the AsyncQueue gets drained during testing, pending Promises
         // (including these idle checks) will get rejected. We special-case
         // these cancelled idle checks to make sure that these specific Promise
         // rejections are not considered unhandled.

packages/firestore/src/remote/remote_store.ts

@@ -708,8 +708,8 @@ export class RemoteStore {
       'onWriteStreamClose() should only be called when the network is enabled'
     );
 
-    // If the write stream closed due to an error, invoke the error callbacks if there are pending
-    // writes.
+    // If the write stream closed due to an error, invoke the error callbacks if
+    // there are pending writes.
     if (error && this.pendingWrites.length > 0) {
       assert(
         !!error,

packages/firestore/src/util/async_queue.ts

@@ -32,9 +32,9 @@ export class AsyncQueue {
   private tail: Promise<AnyJs | void> = Promise.resolve();
 
   // A list with timeout handles and their respective deferred promises.
-  // Contains an entry for each operation that is queued to run future (i.e. it
-  // has a delay that has not yet elapsed). Prior to cleanup, this list may also
-  // contain entries that have already been run (in which case `handle` is
+  // Contains an entry for each operation that is queued to run in the future
+  // (i.e. it has a delay that has not yet elapsed). Prior to cleanup, this list
+  // may also contain entries that have already been run (in which case `handle` is
   // null).
   //
   // tslint:disable-next-line:no-any Accept any type of delayed operation.
@@ -127,8 +127,6 @@ export class AsyncQueue {
   /**
    * Waits until all currently scheduled tasks are finished executing. Tasks
    * schedule with a delay can be rejected or queued for immediate execution.
-   *
-   * @param executeDelayedTasks
    */
   drain(executeDelayedTasks: boolean): Promise<void> {
     this.delayedOperations.forEach(entry => {
@@ -150,6 +148,7 @@ export class AsyncQueue {
       }
     });
     this.delayedOperations = [];
+    this.delayedOperationsCount = 0;
     return this.schedule(() => Promise.resolve());
   }
 }

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

@@ -18,7 +18,7 @@ import { expect } from 'chai';
 import * as firestore from 'firestore';
 
 import { Deferred } from '../../../src/util/promise';
-import { asyncIt, fasyncIt } from '../../util/helpers';
+import { asyncIt } from '../../util/helpers';
 import firebase from '../util/firebase_export';
 import {
   apiDescribe,
@@ -632,7 +632,6 @@ apiDescribe('Database', persistence => {
       return docRef
         .set({ foo: 'bar' })
         .then(() => {
-          console.log(JSON.stringify(queue));
           expect(queue.delayedOperationsCount).to.be.equal(1);
           return queue.drain(/* executeDelayedTasks= */ true);
         })

packages/firestore/test/integration/remote/stream.test.ts

@@ -30,9 +30,8 @@ import {
 } from '../../../src/remote/watch_change';
 import { AsyncQueue } from '../../../src/util/async_queue';
 import { Deferred } from '../../../src/util/promise';
-import { asyncIt, fasyncIt, setMutation } from '../../util/helpers';
+import { asyncIt, setMutation } from '../../util/helpers';
 import { withTestDatastore } from '../util/helpers';
-import { TestQueue } from '../util/test_queue';
 
 /**
  * StreamEventType combines the events that can be observed by the