Prevent console writes after tests?

turt2live · May 29, 2022 · e55dfc9 · e55dfc9
1 parent 9527da0
commit e55dfc9
Show file tree

Hide file tree

Showing 10 changed files with 453 additions and 226 deletions.
diff --git a/test/AdminApisTest.ts b/test/AdminApisTest.ts
@@ -38,9 +38,10 @@ describe('AdminApis', () => {
                 return response;
             });
 
-            http.flushAllExpected();
+            const flush = http.flushAllExpected();
             const result = await client.whoisUser(userId);
             expect(result).toMatchObject(<any>response);
+            await flush;
         });
     });
 });
diff --git a/test/DMsTest.ts b/test/DMsTest.ts
@@ -30,7 +30,7 @@ describe('DMs', () => {
             return {};
         });
 
-        http.flushAllExpected();
+        const flush = http.flushAllExpected();
 
         const accountHandleProm = new Promise<void>(resolve => {
             const orig = (<any>dms).updateFromAccountData.bind(dms);
@@ -76,6 +76,7 @@ describe('DMs', () => {
 
         expect(dms.isDm(dmRoomId1)).toBe(true);
         expect(dms.isDm(dmRoomId2)).toBe(true);
+        await flush;
     });
 
     it('should update from account data when requested', async () => {
@@ -93,10 +94,11 @@ describe('DMs', () => {
         // noinspection TypeScriptValidateJSTypes
         http.when("GET", `/user/${encodeURIComponent(selfUserId)}/account_data/m.direct`).respond(200, accountDataDms);
 
-        http.flushAllExpected();
+        const flush = http.flushAllExpected();
         expect(dms.isDm(dmRoomId)).toBe(false);
         await dms.update();
         expect(dms.isDm(dmRoomId)).toBe(true);
+        await flush;
     });
 
     it('should not fail to update when the account data is missing/fails', async () => {
@@ -109,10 +111,11 @@ describe('DMs', () => {
         // noinspection TypeScriptValidateJSTypes
         http.when("GET", `/user/${encodeURIComponent(selfUserId)}/account_data/m.direct`).respond(404);
 
-        http.flushAllExpected();
+        const flush = http.flushAllExpected();
         expect(dms.isDm(dmRoomId)).toBe(false);
         await dms.update();
         expect(dms.isDm(dmRoomId)).toBe(false);
+        await flush;
     });
 
     it('should create a DM if one does not exist', async () => {
@@ -143,12 +146,13 @@ describe('DMs', () => {
             return {};
         });
 
-        http.flushAllExpected();
+        const flush = http.flushAllExpected();
 
         expect(dms.isDm(dmRoomId)).toBe(false);
         const roomId = await dms.getOrCreateDm(dmUserId);
         expect(roomId).toEqual(dmRoomId);
         expect(dms.isDm(dmRoomId)).toBe(true);
+        await flush;
     });
 
     it('should call the optional create room function when provided', async () => {
@@ -172,13 +176,14 @@ describe('DMs', () => {
             return {};
         });
 
-        http.flushAllExpected();
+        const flush = http.flushAllExpected();
 
         expect(dms.isDm(dmRoomId)).toBe(false);
         const roomId = await dms.getOrCreateDm(dmUserId, fn);
         expect(roomId).toEqual(dmRoomId);
         expect(dms.isDm(dmRoomId)).toBe(true);
         expect(fn.callCount).toBe(1);
+        await flush;
     });
 
     it('should try to patch up DMs when a DM is potentially known', async () => {
@@ -251,7 +256,7 @@ describe('DMs', () => {
             return {};
         });
 
-        http.flushAllExpected();
+        const flush = http.flushAllExpected();
 
         await dms.update();
         expect(dms.isDm(dmRoomId)).toBe(true);
@@ -260,6 +265,7 @@ describe('DMs', () => {
         expect(roomId).toEqual(dmRoomId);
         expect(dms.isDm(dmRoomId)).toBe(true);
         expect(dms.isDm(deadRoomId)).toBe(false);
+        await flush;
     });
 
     it('should use the cache if a DM already exists', async () => {
@@ -280,13 +286,14 @@ describe('DMs', () => {
         // noinspection TypeScriptValidateJSTypes
         http.when("GET", `/user/${encodeURIComponent(selfUserId)}/account_data/m.direct`).respond(200, accountDataDms);
 
-        http.flushAllExpected();
+        const flush = http.flushAllExpected();
 
         await dms.update();
         expect(dms.isDm(dmRoomId)).toBe(true);
         const roomId = await dms.getOrCreateDm(dmUserId);
         expect(roomId).toEqual(dmRoomId);
         expect(dms.isDm(dmRoomId)).toBe(true);
+        await flush;
     });
 
     it('should create an encrypted DM if supported', async () => {
@@ -343,12 +350,13 @@ describe('DMs', () => {
             return {};
         });
 
-        http.flushAllExpected();
+        const flush = http.flushAllExpected();
 
         expect(dms.isDm(dmRoomId)).toBe(false);
         const roomId = await dms.getOrCreateDm(dmUserId);
         expect(roomId).toEqual(dmRoomId);
         expect(dms.isDm(dmRoomId)).toBe(true);
+        await flush;
     });
 
     it('should create an unencrypted DM when the target user has no devices', async () => {
@@ -393,11 +401,12 @@ describe('DMs', () => {
             return {};
         });
 
-        http.flushAllExpected();
+        const flush = http.flushAllExpected();
 
         expect(dms.isDm(dmRoomId)).toBe(false);
         const roomId = await dms.getOrCreateDm(dmUserId);
         expect(roomId).toEqual(dmRoomId);
         expect(dms.isDm(dmRoomId)).toBe(true);
+        await flush;
     });
 });