test: make api teams test fully independent (#31756)

RocketChat · May 27, 2024 · 88d3114 · 88d3114
1 parent 957ccf8
commit 88d3114
Show file tree

Hide file tree

Showing 5 changed files with 317 additions and 276 deletions.
diff --git a/apps/meteor/tests/end-to-end/api/00-miscellaneous.js b/apps/meteor/tests/end-to-end/api/00-miscellaneous.js
@@ -220,6 +220,7 @@ describe('miscellaneous', function () {
 				deleteTeam(normalUserCredentials, teamName),
 				deleteUser(user),
 				deleteRoom({ type: 'c', roomId: testChannel._id }),
+				updatePermission('create-team', ['admin', 'user']),
 			]);
 		});
 

diff --git a/apps/meteor/tests/end-to-end/api/01-users.js b/apps/meteor/tests/end-to-end/api/01-users.js
@@ -3837,21 +3837,7 @@ describe('[Users]', function () {
 				.then(() => done());
 		});
 
-		after(() =>
-			Promise.all([
-				[teamName1, teamName2].map((team) =>
-					request
-						.post(api('teams.delete'))
-						.set(credentials)
-						.send({
-							teamName: team,
-						})
-						.expect('Content-Type', 'application/json')
-						.expect(200),
-				),
-				deleteUser(testUser),
-			]),
-		);
+		after(() => Promise.all([...[teamName1, teamName2].map((team) => deleteTeam(credentials, team)), deleteUser(testUser)]));
 
 		it('should list both channels', (done) => {
 			request

diff --git a/apps/meteor/tests/end-to-end/api/02-channels.js b/apps/meteor/tests/end-to-end/api/02-channels.js
@@ -6,6 +6,7 @@ import { CI_MAX_ROOMS_PER_GUEST as maxRoomsPerGuest } from '../../data/constants
 import { createIntegration, removeIntegration } from '../../data/integration.helper';
 import { updatePermission, updateSetting } from '../../data/permissions.helper';
 import { createRoom, deleteRoom } from '../../data/rooms.helper';
+import { deleteTeam } from '../../data/teams.helper';
 import { testFileUploads } from '../../data/uploads.helper';
 import { adminUsername, password } from '../../data/user';
 import { createUser, login, deleteUser } from '../../data/users.helper';
@@ -2036,7 +2037,7 @@ describe('[Channels]', function () {
 			await Promise.all([
 				updatePermission('create-team', ['admin', 'user']),
 				updatePermission('edit-room', ['admin', 'owner', 'moderator']),
-				deleteRoom({ type: 'c', roomId: testChannel._id }),
+				deleteTeam(credentials, testChannel.name),
 			]);
 		});
 

diff --git a/apps/meteor/tests/end-to-end/api/03-groups.js b/apps/meteor/tests/end-to-end/api/03-groups.js
@@ -6,6 +6,7 @@ import { CI_MAX_ROOMS_PER_GUEST as maxRoomsPerGuest } from '../../data/constants
 import { createIntegration, removeIntegration } from '../../data/integration.helper';
 import { updatePermission, updateSetting } from '../../data/permissions.helper';
 import { createRoom } from '../../data/rooms.helper';
+import { deleteTeam } from '../../data/teams.helper';
 import { testFileUploads } from '../../data/uploads.helper';
 import { adminUsername, password } from '../../data/user';
 import { createUser, login, deleteUser } from '../../data/users.helper';
@@ -1952,16 +1953,7 @@ describe('[Groups]', function () {
 				});
 		});
 
-		after(async () => {
-			await request
-				.post(api('groups.delete'))
-				.set(credentials)
-				.send({
-					roomName: newGroup.name,
-				})
-				.expect('Content-Type', 'application/json')
-				.expect(200);
-		});
+		after(() => Promise.all([deleteTeam(credentials, newGroup.name), updatePermission('create-team', ['admin', 'user'])]));
 
 		it('should fail to convert group if lacking edit-room permission', (done) => {
 			updatePermission('create-team', []).then(() => {