test: Enhance end-to-end tests for DMs (RocketChat#37813)

Author: ggazzo

apps/meteor/app/lib/server/methods/addUsersToRoom.ts

@@ -52,7 +52,7 @@ export const addUsersToRoomMethod = async (userId: string, data: { rid: string;
 	});
 	const userInRoom = subscription != null;
 
-	// Can't add to direct room ever
+	// TODO: Can't add to direct room ever, unless it's a federated room
 	if (room.t === 'd') {
 		throw new Meteor.Error('error-cant-invite-for-direct-room', "Can't invite user to direct rooms", {
 			method: 'addUsersToRoom',

apps/meteor/app/slashcommands-invite/server/server.ts

@@ -96,6 +96,7 @@ slashCommands.add({
 		await Promise.all(
 			usersFiltered.map(async (user) => {
 				try {
+					// TODO: Refactor this to return an error if some user fails to be added
 					return await addUsersToRoomMethod(
 						userId,
 						{

apps/meteor/app/slashcommands-leave/server/leave.ts

@@ -18,14 +18,15 @@ const Leave = async function Leave({ message, userId }: SlashCommandCallbackPara
 			return;
 		}
 		await leaveRoomMethod(user, message.rid);
-	} catch ({ error }: any) {
-		if (typeof error !== 'string') {
-			return;
+	} catch (error: any) {
+		if (typeof error.error !== 'string') {
+			throw error;
 		}
 		const user = await Users.findOneById(userId);
 		void api.broadcast('notify.ephemeralMessage', userId, message.rid, {
 			msg: i18n.t(error, { lng: user?.language || settings.get('Language') || 'en' }),
 		});
+		throw new Meteor.Error(error.error, error.message);
 	}
 };
 

apps/meteor/tests/end-to-end/api/commands.ts

@@ -521,4 +521,116 @@ describe('[Commands]', () => {
 				});
 		});
 	});
+	describe('Command "kick"', function () {
+		let directMessageRoom: IRoom;
+		let user1: TestUser<IUser>;
+		let user1Credentials: Credentials;
+		this.beforeAll(async () => {
+			user1 = await createUser();
+
+			[user1Credentials] = await Promise.all([login(user1.username, password)]);
+		});
+
+		this.beforeAll(async () => {
+			const [response1] = await Promise.all([
+				createRoom({ type: 'd', name: `room1-${Date.now()}.${Random.id()}`, username: user1.username }),
+			]);
+			directMessageRoom = response1.body.room;
+		});
+
+		this.afterAll(async () => {
+			await Promise.all([deleteRoom({ type: 'd', roomId: directMessageRoom._id })]);
+			await Promise.all([deleteUser(user1)]);
+		});
+
+		it('should fail when trying to kick a user from a direct message room', (done) => {
+			void request
+				.post(api('commands.run'))
+				.set(user1Credentials)
+				.send({ command: 'kick', roomId: directMessageRoom._id, params: user1.username })
+				.expect(400)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', false);
+					expect(res.body).to.have.property('error').that.is.a('string');
+				})
+				.end(done);
+		});
+	});
+	describe('Command "leave"', function () {
+		let directMessageRoom: IRoom;
+		let user1: TestUser<IUser>;
+		let user2: TestUser<IUser>;
+		let user1Credentials: Credentials;
+		this.beforeAll(async () => {
+			user1 = await createUser();
+			user2 = await createUser();
+
+			[user1Credentials] = await Promise.all([login(user1.username, password)]);
+		});
+
+		this.beforeAll(async () => {
+			const [response1] = await Promise.all([
+				createRoom({ type: 'd', name: `room1-${Date.now()}.${Random.id()}`, username: user1.username }),
+			]);
+			directMessageRoom = response1.body.room;
+		});
+
+		this.afterAll(async () => {
+			await Promise.all([deleteRoom({ type: 'd', roomId: directMessageRoom._id })]);
+			await Promise.all([deleteUser(user1), deleteUser(user2)]);
+		});
+
+		it('should fail when trying to leave a direct message room', (done) => {
+			void request
+				.post(api('commands.run'))
+				.set(user1Credentials)
+				.send({ command: 'leave', roomId: directMessageRoom._id })
+				.expect(400)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', false);
+					expect(res.body).to.have.property('error').that.is.a('string');
+				})
+				.end(done);
+		});
+	});
+
+	// TODO: invite never fails
+	describe.skip('Command "invite"', function () {
+		let directMessageRoom: IRoom;
+		let user1: TestUser<IUser>;
+		let user2: TestUser<IUser>;
+		let user1Credentials: Credentials;
+		this.beforeAll(async () => {
+			user1 = await createUser();
+			user2 = await createUser();
+
+			[user1Credentials] = await Promise.all([login(user1.username, password)]);
+		});
+
+		this.beforeAll(async () => {
+			const [response1] = await Promise.all([
+				createRoom({ type: 'd', name: `room1-${Date.now()}.${Random.id()}`, username: user1.username }),
+			]);
+			directMessageRoom = response1.body.room;
+		});
+
+		this.afterAll(async () => {
+			await Promise.all([deleteRoom({ type: 'd', roomId: directMessageRoom._id })]);
+			await Promise.all([deleteUser(user1), deleteUser(user2)]);
+		});
+
+		it('should fail when trying to invite a user to a direct message room', (done) => {
+			void request
+				.post(api('commands.run'))
+				.set(user1Credentials)
+				.send({ command: 'invite', roomId: directMessageRoom._id, params: 'g1' })
+				.expect(403)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', false);
+					expect(res.body).to.have.property('error').that.is.a('string');
+					expect(res.body.error).to.equal('unauthorized');
+				})
+				.end(done);
+		});
+	});
 });