From ace65e5f893668befecb1bebc06ed87ff8ad886d Mon Sep 17 00:00:00 2001
From: Carlos Santos <4a.santos@gmail.com>
Date: Wed, 23 Apr 2025 14:41:23 +0200
Subject: [PATCH] tests: await disconnectFakeParticipants in afterEach hooks
 for consistency

---
 .../api/rooms/bulk-delete-rooms.test.ts            |  2 +-
 .../integration/api/rooms/delete-room.test.ts      | 14 +++++++-------
 .../api/rooms/garbage-collector.test.ts            |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/backend/tests/integration/api/rooms/bulk-delete-rooms.test.ts b/backend/tests/integration/api/rooms/bulk-delete-rooms.test.ts
index 2283f48..e171224 100644
--- a/backend/tests/integration/api/rooms/bulk-delete-rooms.test.ts
+++ b/backend/tests/integration/api/rooms/bulk-delete-rooms.test.ts
@@ -20,7 +20,7 @@ describe('Room API Tests', () => {
 
 	afterEach(async () => {
 		// Remove all rooms created
-		disconnectFakeParticipants();
+		await disconnectFakeParticipants();
 		await deleteAllRooms();
 	});
 
diff --git a/backend/tests/integration/api/rooms/delete-room.test.ts b/backend/tests/integration/api/rooms/delete-room.test.ts
index 5116b58..52aadfa 100644
--- a/backend/tests/integration/api/rooms/delete-room.test.ts
+++ b/backend/tests/integration/api/rooms/delete-room.test.ts
@@ -9,6 +9,8 @@ import {
 	disconnectFakeParticipants
 } from '../../../utils/helpers.js';
 import ms from 'ms';
+import { setupMultiRoomTestContext } from '../../../utils/test-scenarios.js';
+import { expectValidRoom } from '../../../utils/assertion-helpers.js';
 
 describe('Room API Tests', () => {
 	beforeAll(async () => {
@@ -21,7 +23,7 @@ describe('Room API Tests', () => {
 
 	afterEach(async () => {
 		// Remove all rooms created
-		disconnectFakeParticipants();
+		await disconnectFakeParticipants();
 		await deleteAllRooms();
 	});
 
@@ -113,9 +115,10 @@ describe('Room API Tests', () => {
 		});
 
 		it('should mark room for deletion (202) when participants exist and force=false', async () => {
+			const autoDeletionDate = Date.now() + ms('5h');
 			const { roomId } = await createRoom({
 				roomIdPrefix: 'test-room',
-				autoDeletionDate: Date.now() + ms('5h')
+				autoDeletionDate
 			});
 
 			await joinFakeParticipant(roomId, 'test-participant');
@@ -125,12 +128,9 @@ describe('Room API Tests', () => {
 			expect(response.status).toBe(202);
 
 			const roomResponse = await getRoom(roomId);
-			expect(roomResponse.body).toBeDefined();
-			expect(roomResponse.body.roomId).toBe(roomId);
-			expect(roomResponse.body.markedForDeletion).toBeDefined();
-			expect(roomResponse.body.markedForDeletion).toBe(true);
+			expectValidRoom(roomResponse.body, 'test-room', autoDeletionDate, undefined, true);
 
-			disconnectFakeParticipants();
+			await disconnectFakeParticipants();
 
 			const responseAfterDelete = await getRoom(roomId);
 			expect(responseAfterDelete.status).toBe(404);
diff --git a/backend/tests/integration/api/rooms/garbage-collector.test.ts b/backend/tests/integration/api/rooms/garbage-collector.test.ts
index 914d18b..072ed7a 100644
--- a/backend/tests/integration/api/rooms/garbage-collector.test.ts
+++ b/backend/tests/integration/api/rooms/garbage-collector.test.ts
@@ -98,7 +98,7 @@ describe('Room Garbage Collector Tests', () => {
 		expect(response.body.autoDeletionDate).toBeTruthy();
 		expect(response.body.autoDeletionDate).toBeLessThan(Date.now());
 
-		disconnectFakeParticipants();
+		await disconnectFakeParticipants();
 
 		// Wait to receive webhook room_finished
 		await sleep('2s');