test: make channels api tests fully independent (#31606)

RocketChat · Feb 5, 2024 · de6997e · de6997e
1 parent 4442737
commit de6997e
Show file tree

Hide file tree

Showing 6 changed files with 775 additions and 771 deletions.
diff --git a/apps/meteor/tests/data/api-data.js b/apps/meteor/tests/data/api-data.js
@@ -15,7 +15,6 @@ export function wait(cb, time) {
 
 export const apiUsername = `api${username}-${Date.now()}`;
 export const apiEmail = `api${email}-${Date.now()}`;
-export const apiPublicChannelName = `api${publicChannelName}-${Date.now()}`;
 export const apiPrivateChannelName = `api${privateChannelName}-${Date.now()}`;
 
 export const apiRoleNameUsers = `api${roleNameUsers}`;
@@ -25,7 +24,6 @@ export const apiRoleScopeSubscriptions = `${roleScopeSubscriptions}`;
 export const apiRoleDescription = `api${roleDescription}`;
 export const reservedWords = ['admin', 'administrator', 'system', 'user'];
 
-export const channel = {};
 export const group = {};
 export const message = {};
 export const directMessage = {};

diff --git a/apps/meteor/tests/data/channel.ts b/apps/meteor/tests/data/channel.ts
@@ -1,2 +1 @@
-export const publicChannelName = `channel-test-${Date.now()}`;
 export const privateChannelName = `private-channel-test-${Date.now()}`;
diff --git a/apps/meteor/tests/data/uploads.helper.ts b/apps/meteor/tests/data/uploads.helper.ts
@@ -7,18 +7,30 @@ import { password } from './user';
 import { createUser, login } from './users.helper';
 import { imgURL } from './interactions';
 import { updateSetting } from './permissions.helper';
-import { createRoom } from './rooms.helper';
+import { createRoom, deleteRoom } from './rooms.helper';
 import { createVisitor } from './livechat/rooms';
 
-export async function testFileUploads(filesEndpoint: 'channels.files' | 'groups.files' | 'im.files', room: { _id: string; name?: string; t: string;}, invalidRoomError = 'error-room-not-found') {
+export async function testFileUploads(filesEndpoint: 'channels.files' | 'groups.files' | 'im.files', roomType: 'c' | 'd' | 'p', invalidRoomError = 'error-room-not-found') {
+	let testRoom: Record<string, any>;
+	const propertyMap = {
+		'c': 'channel',
+		'p': 'group',
+		'd': 'room',
+	};
+
 	before(async function () {
 		await updateSetting('VoIP_Enabled', true);
 		await updateSetting('Message_KeepHistory', true);
+
+		testRoom = (await createRoom({ type: roomType, ...(roomType === 'd' ? { username: 'rocket.cat' } : { name: `channel-files-${Date.now()}` }) } as any)).body[propertyMap[roomType]];
 	});
 
 	after(async function () {
-		await updateSetting('VoIP_Enabled', false);
-		await updateSetting('Message_KeepHistory', false);
+		await Promise.all([
+			deleteRoom({ type: 'c', roomId: testRoom._id }),
+			updateSetting('VoIP_Enabled', false),
+			updateSetting('Message_KeepHistory', false),
+		]);
 	});
 
 	const createVoipRoom = async function () {
@@ -34,6 +46,7 @@ export async function testFileUploads(filesEndpoint: 'channels.files' | 'groups.
 			username: null,
 			members: null,
 		});
+
 		return roomResponse.body.room;
 	};
 
@@ -74,7 +87,7 @@ export async function testFileUploads(filesEndpoint: 'channels.files' | 'groups.
 			.get(api(filesEndpoint))
 			.set(credentials)
 			.query({
-				roomId: room._id,
+				roomId: testRoom._id,
 			})
 			.expect('Content-Type', 'application/json')
 			.expect(200)
@@ -90,7 +103,7 @@ export async function testFileUploads(filesEndpoint: 'channels.files' | 'groups.
 			.get(api(filesEndpoint))
 			.set(credentials)
 			.query({
-				roomId: room._id,
+				roomId: testRoom._id,
 				count: 5,
 				offset: 0,
 			})
@@ -104,14 +117,14 @@ export async function testFileUploads(filesEndpoint: 'channels.files' | 'groups.
 	});
 
 	it('should succeed when searching by roomName', function (done) {
-		if (!room.name) {
+		if (!testRoom.name) {
 			this.skip();
 		}
 		request
 			.get(api(filesEndpoint))
 			.set(credentials)
 			.query({
-				roomName: room.name,
+				roomName: testRoom.name,
 			})
 			.expect('Content-Type', 'application/json')
 			.expect(200)
@@ -123,14 +136,14 @@ export async function testFileUploads(filesEndpoint: 'channels.files' | 'groups.
 	});
 
 	it('should succeed when searching by roomName even requested with count and offset params', function (done) {
-		if (!room.name) {
+		if (!testRoom.name) {
 			this.skip();
 		}
 		request
 			.get(api(filesEndpoint))
 			.set(credentials)
 			.query({
-				roomName: room.name,
+				roomName: testRoom.name,
 				count: 5,
 				offset: 0,
 			})
@@ -145,7 +158,7 @@ export async function testFileUploads(filesEndpoint: 'channels.files' | 'groups.
 
 	it('should not return thumbnails', async function () {
 		await request
-			.post(api(`rooms.upload/${room._id}`))
+			.post(api(`rooms.upload/${testRoom._id}`))
 			.set(credentials)
 			.attach('file', imgURL)
 			.expect('Content-Type', 'application/json')
@@ -158,7 +171,7 @@ export async function testFileUploads(filesEndpoint: 'channels.files' | 'groups.
 			.get(api(filesEndpoint))
 			.set(credentials)
 			.query({
-				roomId: room._id,
+				roomId: testRoom._id,
 			})
 			.expect('Content-Type', 'application/json')
 			.expect(200)
@@ -179,7 +192,7 @@ export async function testFileUploads(filesEndpoint: 'channels.files' | 'groups.
 		let fileId: string;
 
 		await request
-			.post(api(`rooms.upload/${room._id}`))
+			.post(api(`rooms.upload/${testRoom._id}`))
 			.set(credentials)
 			.attach('file', imgURL)
 			.expect('Content-Type', 'application/json')
@@ -195,7 +208,7 @@ export async function testFileUploads(filesEndpoint: 'channels.files' | 'groups.
 			.post(api('chat.delete'))
 			.set(credentials)
 			.send({
-				roomId: room._id,
+				roomId: testRoom._id,
 				msgId,
 			})
 			.expect('Content-Type', 'application/json')
@@ -205,7 +218,7 @@ export async function testFileUploads(filesEndpoint: 'channels.files' | 'groups.
 			.get(api(filesEndpoint))
 			.set(credentials)
 			.query({
-				roomId: room._id,
+				roomId: testRoom._id,
 			})
 			.expect('Content-Type', 'application/json')
 			.expect(200)