conflicts killed test

RocketChat · May 20, 2024 · 80a4678 · 80a4678
1 parent 92bbefe
commit 80a4678
Showing 1 changed file with 2 additions and 16 deletions.
diff --git a/apps/meteor/tests/end-to-end/api/09-rooms.js b/apps/meteor/tests/end-to-end/api/09-rooms.js
@@ -85,15 +85,15 @@ describe('[Rooms]', function () {
 		let testChannel;
 		let user;
 		let userCredentials;
+		const testChannelName = `channel.test.upload.${Date.now()}-${Math.random()}`;
 		let blockedMediaTypes;
 		let testPrivateChannel;
 
-		const testChannelName = `channel.test.upload.${Date.now()}-${Math.random()}`;
-
 		before(async () => {
 			user = await createUser({ joinDefaultChannels: false });
 			userCredentials = await login(user.username, password);
 			testChannel = (await createRoom({ type: 'c', name: testChannelName })).body.channel;
+			testPrivateChannel = (await createRoom({ type: 'p', name: `channel.test.private.${Date.now()}-${Math.random()}` })).body.group;
 			blockedMediaTypes = await getSettingValueById('FileUpload_MediaTypeBlackList');
 			const newBlockedMediaTypes = blockedMediaTypes
 				.split(',')
@@ -114,20 +114,6 @@ describe('[Rooms]', function () {
 			]),
 		);
 
-		it('create an channel', (done) => {
-			createRoom({ type: 'c', name: testChannelName }).end((err, res) => {
-				testChannel = res.body.channel;
-				done();
-			});
-		});
-		it('create a private channel', async () => {
-			const {
-				body: { group },
-			} = await createRoom({ type: 'p', name: `channel.test.private.${Date.now()}-${Math.random()}` });
-
-			testPrivateChannel = group;
-		});
-
 		it("don't upload a file to room with file field other than file", (done) => {
 			request
 				.post(api(`rooms.upload/${testChannel._id}`))