Harden callback asserts

Author: schmidt-sebastian

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

@@ -117,11 +117,11 @@ describeSpec('Persistence:', ['persistence'], () => {
       .userSets('users/user1', { uid: 'user1', extra: true })
       .changeUser(null)
       .expectNumOutstandingWrites(1)
-      .writeAcks('users/anon', 1000, { expectUserCallback: false })
+      .writeAcks('users/anon', 1000)
       .changeUser('user1')
       .expectNumOutstandingWrites(2)
-      .writeAcks('users/user1', 2000, { expectUserCallback: false })
-      .writeAcks('users/user1', 3000, { expectUserCallback: false });
+      .writeAcks('users/user1', 2000)
+      .writeAcks('users/user1', 3000);
   });
 
   specTest(

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

@@ -947,14 +947,18 @@ abstract class TestRunner {
       if ('isPrimary' in expectation) {
         expect(this.isPrimaryClient).to.eq(expectation.isPrimary!, 'isPrimary');
       }
-      if ('userCallbacks' in expectation) {
-        expect(this.acknowledgedDocs).to.have.members(
+    }
+
+    if (expectation && expectation.userCallbacks) {
+      expect(this.acknowledgedDocs).to.have.members(
           expectation.userCallbacks.acknowledgedDocs
-        );
-        expect(this.rejectedDocs).to.have.members(
+      );
+      expect(this.rejectedDocs).to.have.members(
           expectation.userCallbacks.rejectedDocs
-        );
-      }
+      );
+    } else {
+      expect(this.acknowledgedDocs).to.be.empty;
+      expect(this.rejectedDocs).to.be.empty;
     }
 
     if (this.numClients === 1) {

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

@@ -645,7 +645,7 @@ describeSpec('Writes:', [], () => {
         expectRequestCount({ handshakes: 2, writes: 2, closes: 1 })
       )
       .expectNumOutstandingWrites(1)
-      .writeAcks('collection/key', 1, { expectUserCallback: false })
+      .writeAcks('collection/key', 1)
       .expectNumOutstandingWrites(0);
   });