From 6c17292ce813c8e33a00e5b7fbfc3f06a2d584d9 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Wed, 19 Jun 2024 17:21:56 -0300
Subject: [PATCH] test: fix flaky `Team join` api tests (#32634)

---
 apps/meteor/tests/data/users.helper.js       | 4 ++--
 apps/meteor/tests/end-to-end/api/25-teams.js | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/apps/meteor/tests/data/users.helper.js b/apps/meteor/tests/data/users.helper.js
index 841ec56d7db..5f4d9320488 100644
--- a/apps/meteor/tests/data/users.helper.js
+++ b/apps/meteor/tests/data/users.helper.js
@@ -5,8 +5,8 @@ import { MongoClient } from 'mongodb';
 import { URL_MONGODB } from '../e2e/config/constants';
 
 export const createUser = (userData = {}) =>
-	new Promise((resolve) => {
-		const username = userData.username || `user.test.${Date.now()}`;
+	new Promise((resolve, reject) => {
+		const username = userData.username || `user.test.${Date.now()}.${Math.random()}`;
 		const email = userData.email || `${username}@rocket.chat`;
 		request
 			.post(api('users.create'))
diff --git a/apps/meteor/tests/end-to-end/api/25-teams.js b/apps/meteor/tests/end-to-end/api/25-teams.js
index 49a1d663aef..6fc9899e403 100644
--- a/apps/meteor/tests/end-to-end/api/25-teams.js
+++ b/apps/meteor/tests/end-to-end/api/25-teams.js
@@ -1602,9 +1602,10 @@ describe('[Teams]', () => {
 			let testUser2;
 
 			before(async () => {
-				const [testUserResult, testUser1Result] = await Promise.all([createUser(), createUser()]);
-				testUser1 = testUserResult;
-				testUser2 = testUser1Result;
+				const [testUser1Result, testUser2Result] = await Promise.all([createUser(), createUser()]);
+
+				testUser1 = testUser1Result;
+				testUser2 = testUser2Result;
 			});
 
 			beforeEach(async () => {