Chore: Remove duplicated functions in tests (#28336)

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

@@ -69,7 +69,6 @@ export async function testFileUploads(filesEndpoint: 'channels.files' | 'groups.
 	});
 
 	it('should succeed when searching by roomId', function (done) {
-		console.log('room._id ->', room._id);
 		request
 			.get(api(filesEndpoint))
 			.set(credentials)

apps/meteor/tests/data/users.helper.js

@@ -61,7 +61,6 @@ export const getUserStatus = (userId) =>
 			});
 	});
 
-
 export const getMe = (overrideCredential = credentials) =>
 	new Promise((resolve) => {
 		request

apps/meteor/tests/end-to-end/api/01-users.js

@@ -21,50 +21,6 @@ import { updatePermission, updateSetting } from '../../data/permissions.helper';
 import { createUser, login, deleteUser, getUserStatus } from '../../data/users.helper.js';
 import { createRoom } from '../../data/rooms.helper';
 
-function createTestUser() {
-	return new Promise((resolve) => {
-		const username = `user.test.${Date.now()}`;
-		const email = `${username}@rocket.chat`;
-		request
-			.post(api('users.create'))
-			.set(credentials)
-			.send({ email, name: username, username, password, joinDefaultChannels: false })
-			.end((err, res) => resolve(res.body.user));
-	});
-}
-
-function loginTestUser(user) {
-	return new Promise((resolve, reject) => {
-		request
-			.post(api('login'))
-			.send({
-				user: user.username,
-				password,
-			})
-			.expect('Content-Type', 'application/json')
-			.expect(200)
-			.expect((res) => {
-				const userCredentials = {};
-				userCredentials['X-Auth-Token'] = res.body.data.authToken;
-				userCredentials['X-User-Id'] = res.body.data.userId;
-				resolve(userCredentials);
-			})
-			.end((err) => (err ? reject(err) : resolve()));
-	});
-}
-
-function deleteTestUser(user) {
-	return new Promise((resolve) => {
-		request
-			.post(api('users.delete'))
-			.set(credentials)
-			.send({
-				userId: user._id,
-			})
-			.end(resolve);
-	});
-}
-
 async function createChannel(userCredentials, name) {
 	const res = await request.post(api('channels.create')).set(userCredentials).send({
 		name,
@@ -703,12 +659,12 @@ describe('[Users]', function () {
 		after((done) => clearCustomFields(done));
 
 		before(async () => {
-			user2 = await createTestUser();
-			user2Credentials = await loginTestUser(user2);
+			user2 = await createUser({ joinDefaultChannels: false });
+			user2Credentials = await login(user2.username, password);
 		});
 
 		after(async () => {
-			await deleteTestUser(user2);
+			await deleteUser(user2);
 			user2 = undefined;
 
 			await updatePermission('view-outside-room', ['admin', 'owner', 'moderator', 'user']);
@@ -3369,12 +3325,12 @@ describe('[Users]', function () {
 		this.timeout(20000);
 
 		before(async () => {
-			user = await createTestUser();
-			userCredentials = await loginTestUser(user);
-			newCredentials = await loginTestUser(user);
+			user = await createUser({ joinDefaultChannels: false });
+			userCredentials = await login(user.username, password);
+			newCredentials = await login(user.username, password);
 		});
 		after(async () => {
-			await deleteTestUser(user);
+			await deleteUser(user);
 			user = undefined;
 		});
 
@@ -3428,11 +3384,11 @@ describe('[Users]', function () {
 			this.timeout(20000);
 
 			before(async () => {
-				user = await createTestUser();
-				user2 = await createTestUser();
+				user = await createUser({ joinDefaultChannels: false });
+				user2 = await createUser({ joinDefaultChannels: false });
 
-				userCredentials = await loginTestUser(user);
-				user2Credentials = await loginTestUser(user2);
+				userCredentials = await login(user.username, password);
+				user2Credentials = await login(user2.username, password);
 
 				await updatePermission('view-outside-room', []);
 
@@ -3805,7 +3761,7 @@ describe('[Users]', function () {
 		});
 
 		before('create new user', (done) => {
-			createTestUser()
+			createUser({ joinDefaultChannels: false })
 				.then((user) => {
 					testUser = user;
 				})

apps/meteor/tests/end-to-end/api/09-rooms.js

@@ -6,97 +6,9 @@ import { closeRoom, createRoom } from '../../data/rooms.helper';
 import { imgURL } from '../../data/interactions.js';
 import { updateEEPermission, updatePermission, updateSetting } from '../../data/permissions.helper';
 import { sendSimpleMessage } from '../../data/chat.helper';
-import { createUser } from '../../data/users.helper';
+import { createUser, deleteUser, login } from '../../data/users.helper';
 import { IS_EE } from '../../e2e/config/constants';
 
-function createTestUser() {
-	return new Promise((resolve) => {
-		const username = `user.test.${Date.now()}`;
-		const email = `${username}@rocket.chat`;
-		request
-			.post(api('users.create'))
-			.set(credentials)
-			.send({ email, name: username, username, password, joinDefaultChannels: false })
-			.end((err, res) => resolve(res.body.user));
-	});
-}
-
-function loginTestUser(user) {
-	return new Promise((resolve, reject) => {
-		request
-			.post(api('login'))
-			.send({
-				user: user.username,
-				password,
-			})
-			.expect('Content-Type', 'application/json')
-			.expect(200)
-			.expect((res) => {
-				const userCredentials = {};
-				userCredentials['X-Auth-Token'] = res.body.data.authToken;
-				userCredentials['X-User-Id'] = res.body.data.userId;
-				resolve(userCredentials);
-			})
-			.end((err) => (err ? reject(err) : resolve()));
-	});
-}
-
-function deleteTestUser(user) {
-	return new Promise((resolve) => {
-		request
-			.post(api('users.delete'))
-			.set(credentials)
-			.send({
-				userId: user._id,
-			})
-			.end(resolve);
-	});
-}
-
-function createTestUser() {
-	return new Promise((resolve) => {
-		const username = `user.test.${Date.now()}`;
-		const email = `${username}@rocket.chat`;
-		request
-			.post(api('users.create'))
-			.set(credentials)
-			.send({ email, name: username, username, password, joinDefaultChannels: false })
-			.end((err, res) => resolve(res.body.user));
-	});
-}
-
-function loginTestUser(user) {
-	return new Promise((resolve, reject) => {
-		request
-			.post(api('login'))
-			.send({
-				user: user.username,
-				password,
-			})
-			.expect('Content-Type', 'application/json')
-			.expect(200)
-			.expect((res) => {
-				const userCredentials = {};
-				userCredentials['X-Auth-Token'] = res.body.data.authToken;
-				userCredentials['X-User-Id'] = res.body.data.userId;
-				resolve(userCredentials);
-			})
-			.end((err) => (err ? reject(err) : resolve()));
-	});
-}
-
-function deleteTestUser(user) {
-	return new Promise((resolve) => {
-		request
-			.post(api('users.delete'))
-			.set(credentials)
-			.send({
-				userId: user._id,
-			})
-			.end(resolve);
-	});
-}
-
 describe('[Rooms]', function () {
 	this.retries(0);
 
@@ -168,12 +80,12 @@ describe('[Rooms]', function () {
 		let userCredentials;
 
 		before(async () => {
-			user = await createTestUser();
-			userCredentials = await loginTestUser(user);
+			user = await createUser({ joinDefaultChannels: false });
+			userCredentials = await login(user.username, password);
 		});
 
 		after(async () => {
-			await deleteTestUser(user);
+			await deleteUser(user);
 			user = undefined;
 
 			await updateSetting('FileUpload_Restrict_to_room_members', false);

apps/meteor/tests/end-to-end/api/18-oauthapps.js

@@ -79,7 +79,6 @@ describe('[OAuthApps]', function () {
 				.expect('Content-Type', 'application/json')
 				.expect(400)
 				.expect((res) => {
-					console.log('res.body ->', res.body);
 					expect(res.body).to.have.property('success', false);
 					expect(res.body).to.have.property('errorType', 'error-not-allowed');
 				});

apps/meteor/tests/end-to-end/api/livechat/09-visitors.ts

@@ -571,7 +571,6 @@ describe('LIVECHAT - visitors', function () {
 						.expect('Content-Type', 'application/json')
 						.expect(200)
 						.expect((res: Response) => {
-							console.log(res.body);
 							expect(res.body).to.have.property('success', true);
 							expect(res.body).to.have.property('history');
 							expect(res.body.history).to.be.an('array');