Undo debugging changes

Author: schmidt-sebastian

integration/firestore/firebase_export.ts

@@ -29,7 +29,7 @@ export function newTestFirestore(
   settings?: firebase.firestore.Settings
 ): firebase.firestore.Firestore {
   if (nameOrApp === undefined) {
-    nameOrApp = 'test-app-minified-' + appCount++;
+    nameOrApp = 'test-app-' + appCount++;
   }
   const app =
     typeof nameOrApp === 'string'

integration/firestore/firebase_export_memory.ts

@@ -29,7 +29,7 @@ export function newTestFirestore(
   settings?: firebase.firestore.Settings
 ): firebase.firestore.Firestore {
   if (nameOrApp === undefined) {
-    nameOrApp = 'test-app-minified-memory-' + appCount++;
+    nameOrApp = 'test-app-' + appCount++;
   }
   const app =
     typeof nameOrApp === 'string'

packages/firestore/package.json

@@ -36,7 +36,7 @@
     "test:exp:browser:debug": "karma start --single-run --exp --auto-watch",
     "test": "run-s lint test:all",
     "test:ci": "node ../../scripts/run_tests_in_ci.js",
-    "test:all": "run-s test:browser test:lite:browser test:exp:browser test:travis test:minified",
+    "test:all": "run-p test:browser test:lite:browser test:exp:browser test:travis test:minified",
     "test:browser": "karma start --single-run",
     "test:browser:debug": "karma start --browsers=Chrome --auto-watch",
     "test:node": "node ./scripts/run-tests.js  --main=index.node.ts  --emulator 'test/{,!(browser)/**/}*.test.ts'",

packages/firestore/src/local/indexeddb_persistence.ts

@@ -75,6 +75,7 @@ import {
   SimpleDbTransaction
 } from './simple_db';
 import { DocumentLike, WindowLike } from '../util/types';
+import {ignoreIfPrimaryLeaseLoss} from "./local_store";
 
 const LOG_TAG = 'IndexedDbPersistence';
 
@@ -680,14 +681,12 @@ export class IndexedDbPersistence implements Persistence {
     }
     this.detachVisibilityHandler();
     this.detachWindowUnloadHook();
-    if (this.simpleDb.isOpen()) {
-      await this.runTransaction('shutdown', 'readwrite', txn => {
-         return this.releasePrimaryLeaseIfHeld(txn).next(() =>
-         this.removeClientMetadata(txn)
-         );
-      });
-      this.simpleDb.close();
-    }
+    await this.runTransaction('shutdown', 'readwrite', txn => 
+       this.releasePrimaryLeaseIfHeld(txn).next(() =>
+       this.removeClientMetadata(txn)
+       )
+    ).catch(e => ignoreIfPrimaryLeaseLoss(e));
+    this.simpleDb.close();
 
     // Remove the entry marking the client as zombied from LocalStorage since
     // we successfully deleted its metadata from IndexedDb.

packages/firestore/src/local/simple_db.ts

@@ -339,10 +339,6 @@ export class SimpleDb {
     }
   }
 
-  isOpen() : boolean {
-    return !!this.db;
-  }
-
   close(): void {
     if (this.db) {
       this.db.close();

packages/firestore/test/integration/util/firebase_export.ts

@@ -66,10 +66,11 @@ export function newTestFirestore(
   nameOrApp?: string | FirebaseApp | FirebaseAppShim,
   settings?: firestore.Settings
 ): firestore.FirebaseFirestore {
+  if (nameOrApp === undefined) {
+    nameOrApp = 'test-app-' + appCount++;
+  }
+
   if (usesFunctionalApi()) {
-    if (nameOrApp === undefined) {
-      nameOrApp = 'test-app-exp-' + appCount++;
-    }
     const app =
       typeof nameOrApp === 'string'
         ? initializeApp({ apiKey: 'fake-api-key', projectId }, nameOrApp)
@@ -79,9 +80,6 @@ export function newTestFirestore(
       : getFirestore(app);
     return new FirestoreShim(firestore);
   } else {
-    if (nameOrApp === undefined) {
-      nameOrApp = 'test-app-' + appCount++;
-    }
     const app =
       typeof nameOrApp === 'string'
         ? firebase.initializeApp(

packages/firestore/test/unit/util/async_queue.test.ts

@@ -396,7 +396,7 @@ describe('AsyncQueue', () => {
     queue.enqueueAndForget(() => doStep(1));
 
     // After this call, only operations requested via
-    // `enqueueAndForgetEvenAfterShutdown` gets executed.
+    // `enqueueAndForgetEvenWhileRestricted` gets executed.
     queue.enterRestrictedMode();
     queue.enqueueAndForgetEvenWhileRestricted(() => doStep(2));
     queue.enqueueAndForget(() => doStep(3));