test: add cleanup to users tests (#30654)

RocketChat · Oct 19, 2023 · 79f6388 · 79f6388
1 parent 5b3ff91
commit 79f6388
Show file tree

Hide file tree

Showing 5 changed files with 275 additions and 247 deletions.
diff --git a/apps/meteor/tests/data/api-data.js b/apps/meteor/tests/data/api-data.js
@@ -13,10 +13,10 @@ export function wait(cb, time) {
 	return () => setTimeout(cb, time);
 }
 
-export const apiUsername = `api${username}`;
-export const apiEmail = `api${email}`;
-export const apiPublicChannelName = `api${publicChannelName}`;
-export const apiPrivateChannelName = `api${privateChannelName}`;
+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}`;
 export const apiRoleNameSubscriptions = `api${roleNameSubscriptions}`;
@@ -25,7 +25,6 @@ export const apiRoleScopeSubscriptions = `${roleScopeSubscriptions}`;
 export const apiRoleDescription = `api${roleDescription}`;
 export const reservedWords = ['admin', 'administrator', 'system', 'user'];
 
-export const targetUser = {};
 export const channel = {};
 export const group = {};
 export const message = {};

diff --git a/apps/meteor/tests/data/custom-fields.js b/apps/meteor/tests/data/custom-fields.js
@@ -1,4 +1,4 @@
-import { getCredentials, request, api, credentials } from './api-data.js';
+import { credentials, request, api } from './api-data.js';
 
 export const customFieldText = {
 	type: 'text',
@@ -7,18 +7,12 @@ export const customFieldText = {
 	maxLength: 10,
 };
 
-export function setCustomFields(customFields, done) {
-	getCredentials((error) => {
-		if (error) {
-			return done(error);
-		}
+export function setCustomFields(customFields) {
+	const stringified = customFields ? JSON.stringify(customFields) : '';
 
-		const stringified = customFields ? JSON.stringify(customFields) : '';
-
-		request.post(api('settings/Accounts_CustomFields')).set(credentials).send({ value: stringified }).expect(200).end(done);
-	});
+	return request.post(api('settings/Accounts_CustomFields')).set(credentials).send({ value: stringified }).expect(200);
 }
 
-export function clearCustomFields(done = () => {}) {
-	setCustomFields(null, done);
+export function clearCustomFields() {
+	return setCustomFields(null);
 }
diff --git a/apps/meteor/tests/data/users.helper.js b/apps/meteor/tests/data/users.helper.js
@@ -33,16 +33,13 @@ export const login = (username, password) =>
 			});
 	});
 
-export const deleteUser = (user) =>
-	new Promise((resolve) => {
-		request
-			.post(api('users.delete'))
-			.set(credentials)
-			.send({
-				userId: user._id,
-			})
-			.end(resolve);
-	});
+export const deleteUser = async (user) =>
+	request
+		.post(api('users.delete'))
+		.set(credentials)
+		.send({
+			userId: user._id,
+		});
 
 export const getUserByUsername = (username) =>
 	new Promise((resolve) => {