Test fix

Author: schmidt-sebastian

packages/firestore/src/local/tab_notification_channel.ts

@@ -25,7 +25,6 @@ import {
   validateNamedOptionalType,
   validateNamedType
 } from '../util/input_validation';
-import { StringMap } from '../util/types';
 
 // Prefix keys used in WebStorage.
 const FIRESTORE_PREFIX = 'fs';
@@ -46,7 +45,7 @@ export interface TabNotificationChannel {
   /** Associates a new Mutation Batch with the current Firestore instance. */
   addPendingMutation(batchId: BatchId): void;
 
-  /** Removes a Mutation Batch from the current Firestore instance .*/
+  /** Removes a Mutation Batch from the current Firestore instance. */
   removePendingMutation(batchId: BatchId): void;
 
   /** Gets the minimum mutation batch for all active instances. */

packages/firestore/test/unit/local/local_storage_notification_channel.test.ts

@@ -138,10 +138,11 @@ describe('LocalStorageNotificationChannel', () => {
   });
 
   describe('combines instance data', () => {
-    const initialTargets = [3, 4];
+    let browserCallback;
     let eventCallback;
 
     beforeEach(() => {
+      browserCallback = window.addEventListener;
       window.addEventListener = (type, callback) => {
         expect(type).to.be.equal('storage');
         eventCallback = callback;
@@ -155,6 +156,10 @@ describe('LocalStorageNotificationChannel', () => {
         });
     });
 
+    afterEach(() => {
+      window.addEventListener = browserCallback;
+    });
+
     const verifyState = (minBatchId: BatchId, activeTargets: TargetId[]) => {
       const actualTargets = Array.from(
         notificationChannel.getAllActiveQueryTargets()

packages/firestore/test/unit/local/persistence_test_helpers.ts

@@ -20,13 +20,9 @@ import { MemoryPersistence } from '../../../src/local/memory_persistence';
 import { SimpleDb } from '../../../src/local/simple_db';
 import { JsonProtoSerializer } from '../../../src/remote/serializer';
 import {
-  InstanceState,
   LocalStorageNotificationChannel,
   TabNotificationChannel
 } from '../../../src/local/tab_notification_channel';
-import { AutoId } from '../../../src/util/misc';
-import { AsyncQueue } from '../../../src/util/async_queue';
-import { StringMap } from '../../../src/util/types';
 import { BatchId, InstanceKey, TargetId } from '../../../src/core/types';
 
 /** The persistence prefix used for testing in IndexedBD and LocalStorage. */