Fix audit log races

FirebaseExtended · Dec 12, 2024 · 08c7827 · 08c7827
1 parent 52eee74
commit 08c7827
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/test/firestore.test.ts b/test/firestore.test.ts
@@ -299,18 +299,18 @@ describe('RxFire Firestore', () => {
      */
     it('should filter the trail of events by event type', (done: jest.DoneCallback) => {
       seedTest(firestore).then(({colRef, davidDoc}) => {
+        const firstAudit = auditTrail(colRef).pipe(unwrapChange, take(1));
         const modifiedAudit = auditTrail(colRef, {events: ['modified']}).pipe(unwrapChange);
 
+        firstAudit.pipe(take(1)).subscribe(() => {
+          updateDoc(davidDoc, {name: 'David!'});
+        });
+
         modifiedAudit.pipe(take(1)).subscribe((updateList) => {
           const expectedEvents = [{type: 'modified', name: 'David!'}];
           expect(updateList).toEqual(expectedEvents);
           done();
         });
-
-        // TODO figure out the race condition here
-        setTimeout(() => {
-          updateDoc(davidDoc, {name: 'David!'});
-        }, 10);
       });
     });
   });
@@ -348,15 +348,18 @@ describe('RxFire Firestore', () => {
      */
     it('should filter the trail of events by event type', (done: jest.DoneCallback) => {
       seedTest(firestore).then(({colRef, davidDoc}) => {
+        const firstAudit = auditTrail(colRef).pipe(unwrapChange, take(1));
         const modifiedAudit = auditTrail(colRef, {events: ['modified']}).pipe(unwrapChange);
 
+        firstAudit.pipe(take(1)).subscribe(() => {
+          updateDoc(davidDoc, {name: 'David!'});
+        });
+
         modifiedAudit.pipe(take(1)).subscribe((updateList) => {
           const expectedEvents = [{type: 'modified', name: 'David!'}];
           expect(updateList).toEqual(expectedEvents);
           done();
         });
-
-        updateDoc(davidDoc, {name: 'David!'});
       });
     });
   });