Fix tests after merge

Author: schmidt-sebastian

packages/firestore/src/local/indexeddb_persistence.ts

@@ -72,7 +72,12 @@ import {
 import { PersistencePromise } from './persistence_promise';
 import { ClientId } from './shared_client_state';
 import { TargetData } from './target_data';
-import { SimpleDb, SimpleDbStore, SimpleDbTransaction } from './simple_db';
+import {
+  isIndexedDbTransactionError,
+  SimpleDb,
+  SimpleDbStore,
+  SimpleDbTransaction
+} from './simple_db';
 
 const LOG_TAG = 'IndexedDbPersistence';
 
@@ -287,7 +292,7 @@ export class IndexedDbPersistence implements Persistence {
         // having the persistence lock), so it's the first thing we should do.
         return this.updateClientMetadataAndTryBecomePrimary();
       })
-      .then(e => {
+      .then(() => {
         if (!this.isPrimary && !this.allowTabSynchronization) {
           // Fail `start()` if `synchronizeTabs` is disabled and we cannot
           // obtain the primary lease.
@@ -423,7 +428,7 @@ export class IndexedDbPersistence implements Persistence {
     )
       .catch(e => {
         if (!this.allowTabSynchronization) {
-          if (e.name === 'IndexedDbTransactionError') {
+          if (isIndexedDbTransactionError(e)) {
             logDebug(LOG_TAG, 'Failed to extend owner lease: ', e);
             // Proceed with the existing state. Any subsequent access to
             // IndexedDB will verify the lease.

packages/firestore/src/local/local_store.ts

@@ -66,6 +66,7 @@ import { IndexedDbMutationQueue } from './indexeddb_mutation_queue';
 import { IndexedDbRemoteDocumentCache } from './indexeddb_remote_document_cache';
 import { IndexedDbTargetCache } from './indexeddb_target_cache';
 import { extractFieldMask } from '../model/object_value';
+import { isIndexedDbTransactionError } from './simple_db';
 
 const LOG_TAG = 'LocalStore';
 
@@ -727,7 +728,7 @@ export class LocalStore {
         }
       );
     } catch (e) {
-      if (e.name === 'IndexedDbTransactionError') {
+      if (isIndexedDbTransactionError(e)) {
         // If `notifyLocalViewChanges` fails, we did not advance the sequence
         // number for the documents that were included in this transaction.
         // This might trigger them to be deleted earlier than they otherwise

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

@@ -1144,7 +1144,7 @@ describe('IndexedDb: allowTabSynchronization', () => {
       'clientA',
       /* multiClient= */ false,
       async db => {
-        db.injectFailures = true;
+        db.injectFailures = { updateClientMetadataAndTryBecomePrimary: true };
         await expect(db.start()).to.eventually.be.rejectedWith(
           'Failed to obtain exclusive access to the persistence layer.'
         );
@@ -1158,7 +1158,7 @@ describe('IndexedDb: allowTabSynchronization', () => {
       'clientA',
       /* multiClient= */ true,
       async db => {
-        db.injectFailures = true;
+        db.injectFailures = { updateClientMetadataAndTryBecomePrimary: true };
         await db.start();
         await db.shutdown();
       }
@@ -1167,10 +1167,10 @@ describe('IndexedDb: allowTabSynchronization', () => {
 
   it('ignores intermittent IndexedDbTransactionError during lease refresh', async () => {
     await withPersistence('clientA', async (db, _, queue) => {
-      db.injectFailures = true;
+      db.injectFailures = { updateClientMetadataAndTryBecomePrimary: true };
       await queue.runDelayedOperationsEarly(TimerId.ClientMetadataRefresh);
       await queue.enqueue(() => {
-        db.injectFailures = false;
+        db.injectFailures = undefined;
         return db.runTransaction('check success', 'readwrite-primary', () =>
           PersistencePromise.resolve()
         );

packages/firestore/test/unit/specs/spec_test_components.ts

@@ -59,7 +59,7 @@ import { expect } from 'chai';
 export class MockMemoryPersistence extends MemoryPersistence {
   injectFailures?: SpecDatabaseFailures;
 
-  runTransaction<T>(
+  async runTransaction<T>(
     action: string,
     mode: PersistenceTransactionMode,
     transactionOperation: (
@@ -78,7 +78,7 @@ export class MockMemoryPersistence extends MemoryPersistence {
 export class MockIndexedDbPersistence extends IndexedDbPersistence {
   injectFailures?: SpecDatabaseFailures;
 
-  runTransaction<T>(
+  async runTransaction<T>(
     action: string,
     mode: PersistenceTransactionMode,
     transactionOperation: (

packages/firestore/test/unit/specs/spec_test_runner.ts

@@ -1214,7 +1214,8 @@ export type PersistenceAction =
   | 'Lookup mutation documents'
   | 'Get target data'
   | 'Get new document changes'
-  | 'Synchronize last document change read time';
+  | 'Synchronize last document change read time'
+  | 'updateClientMetadataAndTryBecomePrimary';
 
 /** Specifies failure or success for a list of database actions. */
 export type SpecDatabaseFailures = Partial<