Using forEach Helper

Author: schmidt-sebastian

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

@@ -398,32 +398,31 @@ describe('IndexedDbSchema: createOrUpgradeDb', () => {
           DbMutationQueue
         >(DbMutationQueue.store);
         // Manually populate the mutation queue and create all indicies.
-        let p = PersistencePromise.resolve();
-        for (const testMutation of testMutations) {
-          p = p.next(() => mutationBatchStore.put(testMutation));
-          for (const write of testMutation.mutations) {
-            p = p.next(() => {
-              const indexKey = DbDocumentMutation.key(
-                testMutation.userId,
-                path(write.update.name, 5),
-                testMutation.batchId
-              );
-              return documentMutationStore.put(
-                indexKey,
-                DbDocumentMutation.PLACEHOLDER
-              );
-            });
-          }
-        }
-        p = p.next(() =>
+        return PersistencePromise.forEach(testMutations, testMutation => {
+          return mutationBatchStore.put(testMutation).next(() => {
+            return PersistencePromise.forEach(
+              testMutation.mutations,
+              mutation => {
+                const indexKey = DbDocumentMutation.key(
+                  testMutation.userId,
+                  path(mutation.update.name, 5),
+                  testMutation.batchId
+                );
+                return documentMutationStore.put(
+                  indexKey,
+                  DbDocumentMutation.PLACEHOLDER
+                );
+              }
+            );
+          });
+        }).next(() =>
           // Populate the mutation queues' metadata
           PersistencePromise.waitFor([
             mutationQueuesStore.put(new DbMutationQueue('foo', 2, '')),
             mutationQueuesStore.put(new DbMutationQueue('bar', 3, '')),
             mutationQueuesStore.put(new DbMutationQueue('empty', -1, ''))
           ])
         );
-        return p;
       });
     }).then(() =>
       withDb(5, db => {