test: fix failing tests

mongodb · Oct 27, 2022 · aec0b97 · aec0b97
1 parent 30b7e10
commit aec0b97
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 17 deletions.
diff --git a/src/change_stream.ts b/src/change_stream.ts
@@ -726,13 +726,15 @@ export class ChangeStream<
     }, callback);
   }
 
-  async *[Symbol.asyncIterator](): AsyncGenerator<TChange, void, never> {
+  async *[Symbol.asyncIterator](): AsyncGenerator<TChange, void, void> {
     if (this.closed) {
       return;
     }
 
     try {
-      while (await this.hasNext()) {
+      // Change streams run indefinitely as long as errors are resumable
+      // So the only loop breaking condition is if `next()` throws
+      while (true) {
         yield await this.next();
       }
     } finally {

diff --git a/test/integration/change-streams/change_stream.test.ts b/test/integration/change-streams/change_stream.test.ts
@@ -1013,6 +1013,7 @@ describe('Change Streams', function () {
           const docs = [{ city: 'New York City' }, { city: 'Seattle' }, { city: 'Boston' }];
           await collection.insertMany(docs);
 
+          await changeStreamIterator.next();
           await changeStreamIterator.return();
           expect(changeStream.closed).to.be.true;
           expect(changeStream.cursor.closed).to.be.true;
@@ -1074,12 +1075,8 @@ describe('Change Streams', function () {
           changeStream.on('change', sinon.stub());
           const changeStreamIterator = changeStream[Symbol.asyncIterator]();
 
-          try {
-            await changeStreamIterator.next();
-            expect.fail('Async iterator was used with emitter-based iteration');
-          } catch (error) {
-            expect(error).to.be.instanceOf(MongoAPIError);
-          }
+          const error = await changeStreamIterator.next().catch(e => e);
+          expect(error).to.be.instanceOf(MongoAPIError);
         }
       );
 
@@ -2406,15 +2403,10 @@ describe('ChangeStream resumability', function () {
             } as FailPoint);
 
             await collection.insertOne({ city: 'New York City' });
-            try {
-              await changeStreamIterator.next();
-              expect.fail(
-                'Change stream did not throw unresumable error and did not produce any events'
-              );
-            } catch (error) {
-              expect(error).to.be.instanceOf(MongoServerError);
-              expect(aggregateEvents).to.have.lengthOf(1);
-            }
+
+            const error = await changeStreamIterator.next().catch(e => e);
+            expect(error).to.be.instanceOf(MongoServerError);
+            expect(aggregateEvents).to.have.lengthOf(1);
           }
         );
       });