From 9b8e8eee4159a56f0b2b915d8b4b2850f2e97522 Mon Sep 17 00:00:00 2001
From: Jessica Schelly Souza <jessica_schelly@hotmail.com>
Date: Mon, 20 Apr 2026 14:21:46 -0300
Subject: [PATCH 1/2] test: fix team-management flaky test

---
 apps/meteor/tests/e2e/team-management.spec.ts | 52 ++++++++-----------
 1 file changed, 22 insertions(+), 30 deletions(-)

diff --git a/apps/meteor/tests/e2e/team-management.spec.ts b/apps/meteor/tests/e2e/team-management.spec.ts
index e1745212c6ea7..e44130f187856 100644
--- a/apps/meteor/tests/e2e/team-management.spec.ts
+++ b/apps/meteor/tests/e2e/team-management.spec.ts
@@ -15,8 +15,6 @@ test.describe('teams-management-permissions', () => {
 	test.beforeEach(async ({ page }) => {
 		poHomeTeam = new HomeTeam(page);
 		newTeamModal = new CreateNewTeamModal(page);
-
-		await page.goto('/home');
 	});
 
 	test.afterEach(async ({ api }) => {
@@ -28,14 +26,10 @@ test.describe('teams-management-permissions', () => {
 		});
 	});
 
-	test('should not allow to create public team if user does not have the create-c permission', async ({ api }) => {
-		expect(
-			(
-				await api.post('/permissions.update', {
-					permissions: [{ _id: 'create-c', roles: [] }],
-				})
-			).status(),
-		).toBe(200);
+	test('should not allow to create public team if user does not have the create-c permission', async ({ page, api }) => {
+		await expect(await api.post('/permissions.update', { permissions: [{ _id: 'create-c', roles: [] }] })).toBeOK();
+		await page.goto('/home');
+		await poHomeTeam.waitForHome();
 
 		await poHomeTeam.navbar.openCreate('Team');
 
@@ -43,14 +37,10 @@ test.describe('teams-management-permissions', () => {
 		await expect(newTeamModal.checkboxPrivate).toBeChecked();
 	});
 
-	test('should not allow to create private team if user does not have the create-p permission', async ({ api }) => {
-		expect(
-			(
-				await api.post('/permissions.update', {
-					permissions: [{ _id: 'create-p', roles: [] }],
-				})
-			).status(),
-		).toBe(200);
+	test('should not allow to create private team if user does not have the create-p permission', async ({ page, api }) => {
+		await expect(await api.post('/permissions.update', { permissions: [{ _id: 'create-p', roles: [] }] })).toBeOK();
+		await page.goto('/home');
+		await poHomeTeam.waitForHome();
 
 		await poHomeTeam.navbar.openCreate('Team');
 
@@ -58,20 +48,21 @@ test.describe('teams-management-permissions', () => {
 		await expect(newTeamModal.checkboxPrivate).not.toBeChecked();
 	});
 
-	test('should not allow to create team if user does not have both create-p and create-c permissions', async ({ api }) => {
-		expect(
-			(
-				await api.post('/permissions.update', {
-					permissions: [
-						{ _id: 'create-p', roles: [] },
-						{ _id: 'create-c', roles: [] },
-					],
-				})
-			).status(),
-		).toBe(200);
+	test('should not allow to create team if user does not have both create-p and create-c permissions', async ({ page, api }) => {
+		await expect(
+			await api.post('/permissions.update', {
+				permissions: [
+					{ _id: 'create-p', roles: [] },
+					{ _id: 'create-c', roles: [] },
+				],
+			}),
+		).toBeOK();
+		await page.goto('/home');
+		await poHomeTeam.waitForHome();
 
 		await poHomeTeam.navbar.btnCreateNew.click();
-		await expect(poHomeTeam.navbar.createNewMenu.getByRole('menuitem', { name: 'Team' })).not.toBeVisible();
+		await expect(poHomeTeam.navbar.createNewMenu).toBeVisible();
+		await expect(poHomeTeam.navbar.createNewMenu.getByRole('menuitem', { name: 'Team' })).toHaveCount(0);
 	});
 });
 
@@ -110,6 +101,7 @@ test.describe.serial('teams-management', () => {
 		newChannelModal = new CreateNewChannelModal(page);
 
 		await page.goto('/home');
+		await poHomeTeam.waitForHome();
 	});
 
 	test('should create targetTeam private', async ({ page }) => {

From 34a09cc80a34daa9703339900a43334602a28843 Mon Sep 17 00:00:00 2001
From: Jessica Schelly Souza <jessica_schelly@hotmail.com>
Date: Mon, 20 Apr 2026 14:28:00 -0300
Subject: [PATCH 2/2] fix: improve assertion

---
 apps/meteor/tests/e2e/team-management.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/meteor/tests/e2e/team-management.spec.ts b/apps/meteor/tests/e2e/team-management.spec.ts
index e44130f187856..08435079423e6 100644
--- a/apps/meteor/tests/e2e/team-management.spec.ts
+++ b/apps/meteor/tests/e2e/team-management.spec.ts
@@ -62,7 +62,7 @@ test.describe('teams-management-permissions', () => {
 
 		await poHomeTeam.navbar.btnCreateNew.click();
 		await expect(poHomeTeam.navbar.createNewMenu).toBeVisible();
-		await expect(poHomeTeam.navbar.createNewMenu.getByRole('menuitem', { name: 'Team' })).toHaveCount(0);
+		await expect(poHomeTeam.navbar.createNewMenuItem('Team')).not.toBeVisible();
 	});
 });