test: Fixing a weird problem happening when running the autojoin tests

apps/meteor/tests/data/teams.helper.ts

@@ -1,28 +1,40 @@
-import { ITeam, TEAM_TYPE } from "@rocket.chat/core-typings"
-import { api, request } from "./api-data"
-import { IUser } from "@rocket.chat/apps-engine/definition/users";
+import { IRoom, ITeam, TEAM_TYPE } from '@rocket.chat/core-typings';
+import { api, request } from './api-data';
+import { IUser } from '@rocket.chat/apps-engine/definition/users';
 
 export const createTeam = async (credentials: Record<string, any>, teamName: string, type: TEAM_TYPE): Promise<ITeam> => {
-    const response = await request.post(api('teams.create')).set(credentials).send({
-        name: teamName,
-        type,
-    });
+	const response = await request.post(api('teams.create')).set(credentials).send({
+		name: teamName,
+		type,
+	});
 
-    return response.body.team;
+	return response.body.team;
 };
 
 export const deleteTeam = async (credentials: Record<string, any>, teamName: string): Promise<void> => {
-    await request.post(api('teams.delete')).set(credentials).send({
-        teamName,
-    });
+	await request.post(api('teams.delete')).set(credentials).send({
+		teamName,
+	});
 };
 
 export const addMembers = async (credentials: Record<string, any>, teamName: string, members: IUser['id'][]): Promise<void> => {
-    await request
-        .post(api('teams.addMembers'))
-        .set(credentials)
-        .send({
-            teamName: teamName,
-            members: members.map((userId) => ({ userId, roles: ['member'] }))
-        });
+	await request
+		.post(api('teams.addMembers'))
+		.set(credentials)
+		.send({
+			teamName: teamName,
+			members: members.map((userId) => ({ userId, roles: ['member'] })),
+		});
+};
+
+export const addRoom = async (
+	credentials: Record<string, any>,
+	teamName: string,
+	roomId: IRoom['_id'] | Array<IRoom['_id']>,
+): Promise<void> => {
+	const rooms = Array.isArray(roomId) ? roomId : [roomId];
+	await request.post(api('teams.addRooms')).set(credentials).send({
+		teamName,
+		rooms,
+	});
 };

apps/meteor/tests/end-to-end/api/25-teams.js

@@ -1,11 +1,11 @@
 import { TEAM_TYPE } from '@rocket.chat/core-typings';
 import { expect } from 'chai';
-import { after, afterEach, before, beforeEach, describe, it } from 'mocha';
+import { after, before, describe, it } from 'mocha';
 
 import { getCredentials, api, request, credentials, methodCall } from '../../data/api-data';
 import { updatePermission, updateSetting } from '../../data/permissions.helper';
 import { createRoom, deleteRoom } from '../../data/rooms.helper';
-import { addMembers, createTeam, deleteTeam } from '../../data/teams.helper';
+import { addMembers, addRoom, createTeam, deleteTeam } from '../../data/teams.helper';
 import { adminUsername, password } from '../../data/user';
 import { createUser, deleteUser, login } from '../../data/users.helper';
 
@@ -1596,50 +1596,46 @@ describe('[Teams]', () => {
 		});
 
 		describe('team auto-join', () => {
-			let testTeam;
-			let createdRoom;
 			let testUser1;
 			let testUser2;
 
+			const testRooms = [];
+			const testTeams = [];
+
 			before(async () => {
-				const [testUserResult, testUser1Result] = await Promise.all([createUser(), createUser()]);
-				testUser1 = testUserResult;
-				testUser2 = testUser1Result;
+				testUser1 = await createUser();
+				testUser2 = await createUser();
 			});
 
-			beforeEach(async () => {
-				const createTeamPromise = createTeam(credentials, `test-team-name${Date.now()}`, 0);
-				const createRoomPromise = createRoom({ name: `test-room-name${Date.now()}`, type: 'c' });
-				const [testTeamCreationResult, testRoomCreationResult] = await Promise.all([createTeamPromise, createRoomPromise]);
-
-				testTeam = testTeamCreationResult;
-				createdRoom = testRoomCreationResult;
+			after(() =>
+				Promise.all([
+					updateSetting('API_User_Limit', 500),
+					deleteUser(testUser1),
+					deleteUser(testUser2),
+					...testRooms.map((r) => deleteRoom({ roomId: r._id, type: 'c' })),
+					...testTeams.map((t) => deleteTeam(credentials, t.name)),
+				]),
+			);
 
-				await request
-					.post(api('teams.addRooms'))
-					.set(credentials)
-					.expect(200)
-					.send({
-						rooms: [createdRoom.body.channel._id],
-						teamName: testTeam.name,
-					});
-			});
+			it('should add members when the members count is less than or equal to the API_User_Limit setting', async () => {
+				const [testTeam, testRoom] = await Promise.all([
+					createTeam(credentials, `test-team-name${Date.now()}`, 0),
+					createRoom({ name: `test-room-name${Date.now()}`, type: 'c' }),
+				]);
 
-			afterEach(() =>
-				Promise.all([deleteTeam(credentials, testTeam.name), deleteRoom({ roomId: createdRoom.body.channel._id, type: 'c' })]),
-			);
+				testTeams.push(testTeam);
+				testRooms.push(testRoom.body.channel);
 
-			after(() => Promise.all([updateSetting('API_User_Limit', 500), deleteUser(testUser1), deleteUser(testUser2)]));
+				await addRoom(credentials, testTeam.name, testRoom.body.channel._id);
 
-			it('should add members when the members count is less than or equal to the API_User_Limit setting', async () => {
 				await updateSetting('API_User_Limit', 2);
 
 				await addMembers(credentials, testTeam.name, [testUser1._id, testUser2._id]);
 				await request
 					.post(api('teams.updateRoom'))
 					.set(credentials)
 					.send({
-						roomId: createdRoom.body.channel._id,
+						roomId: testRoom.body.channel._id,
 						isDefault: true,
 					})
 					.expect(200)
@@ -1650,14 +1646,24 @@ describe('[Teams]', () => {
 			});
 
 			it('should not add all members when we update a team channel to be auto-join and the members count is greater than the API_User_Limit setting', async () => {
+				const [testTeam, testRoom] = await Promise.all([
+					createTeam(credentials, `test-team-name${Date.now()}`, 0),
+					createRoom({ name: `test-room-name${Date.now()}`, type: 'c' }),
+				]);
+
+				testTeams.push(testTeam);
+				testRooms.push(testRoom.body.channel);
+
+				await addRoom(credentials, testTeam.name, testRoom.body.channel._id);
+
 				await updateSetting('API_User_Limit', 1);
 
 				await addMembers(credentials, testTeam.name, [testUser1._id, testUser2._id]);
 				await request
 					.post(api('teams.updateRoom'))
 					.set(credentials)
 					.send({
-						roomId: createdRoom.body.channel._id,
+						roomId: testRoom.body.channel._id,
 						isDefault: true,
 					})
 					.expect(200)