[MS] Fixed flaky tests related to fab button

Author: Max-7

client/tests/e2e/specs/small_display_fab_menu.spec.ts

@@ -6,52 +6,66 @@ msTest('Fab button and menu as administrator and read/write', async ({ workspace
   await workspaces.setDisplaySize(DisplaySize.Small);
   const fabButton = workspaces.locator('#add-menu-fab-button');
   const tabBarButtons = workspaces.locator('#tab-bar').locator('.tab-bar-menu-button');
-  const fabModalOptions = workspaces.locator('#fab-modal').locator('.list-group-item');
+  const fabModal = workspaces.locator('.tab-menu-modal');
+  const fabModalOptions = fabModal.locator('.list-group-item');
 
   // WorkspacesPage
   await expect(fabButton).toBeVisible();
+  await expect(fabModal).toBeHidden();
   await fabButton.click();
+  await expect(fabModal).toBeVisible();
   await expect(fabModalOptions).toHaveCount(2);
   await expect(fabModalOptions).toHaveText(['New workspace', 'Invite a user']);
   await fabButton.click();
+  await expect(fabModal).toBeHidden();
 
   // Read/write workspace + admin
   await workspaces.locator('.workspaces-container-grid').locator('.workspace-card-item').nth(0).click();
   await expect(fabButton).toBeVisible();
   await fabButton.click();
+  await expect(fabModal).toBeVisible();
   await expect(fabModalOptions).toHaveCount(4);
   await expect(fabModalOptions).toHaveText(['New folder', 'Import a folder', 'Import files', 'Invite a user']);
   await fabButton.click();
+  await expect(fabModal).toBeHidden();
 
   // Organization management
   await tabBarButtons.nth(2).click();
   await expect(workspaces).toBeOrganizationPage();
   await fabButton.click();
+  await expect(fabModal).toBeVisible();
   await expect(fabModalOptions).toHaveCount(2);
   await expect(fabModalOptions).toHaveText(['Invite a user', 'Copy link (PKI)']);
   await fabButton.click();
+  await expect(fabModal).toBeHidden();
 
   // No button in profile page
   await tabBarButtons.nth(3).click();
   await expect(workspaces).toBeMyProfilePage();
   await fabButton.click();
+  await expect(fabModal).toBeVisible();
   await expect(fabModalOptions).toHaveCount(2);
   await expect(fabModalOptions).toHaveText(['Invite a user', 'Copy link (PKI)']);
   await fabButton.click();
+  await expect(fabModal).toBeHidden();
 });
 
 msTest('Fab button and menu as standard and reader', async ({ workspacesStandard }) => {
   await workspacesStandard.setDisplaySize(DisplaySize.Small);
   const fabButton = workspacesStandard.locator('#add-menu-fab-button');
   const tabBarButtons = workspacesStandard.locator('#tab-bar').locator('.tab-bar-menu-button');
-  const fabModalOptions = workspacesStandard.locator('#fab-modal').getByRole('listitem');
+  const fabModal = workspacesStandard.locator('.tab-menu-modal');
+  const fabModalOptions = fabModal.getByRole('listitem');
 
   // WorkspacesPage
+  await expect(fabModal).toBeHidden();
   await expect(fabButton).toBeVisible();
   await fabButton.click();
+  await expect(fabModal).toBeVisible();
   await expect(fabModalOptions).toHaveCount(1);
   await expect(fabModalOptions).toHaveText(['New workspace']);
   await fabButton.click();
+  await expect(fabModal).toBeHidden();
 
   // No button in reader workspace
   await workspacesStandard.locator('.workspaces-container-grid').locator('.workspace-card-item').nth(0).click();

client/tests/e2e/specs/users_list.spec.ts

@@ -321,9 +321,11 @@ msTest('User filter popover default state', async ({ usersPage }) => {
 async function toggleFilter(page: Page, name: string): Promise<void> {
   await page.locator('#activate-users-ms-action-bar').locator('#select-filter-popover-button').click();
   const popover = page.locator('.filter-popover');
+  await expect(popover).toBeVisible();
   await popover.getByRole('listitem').filter({ hasText: name }).locator('ion-checkbox').click();
   // Click the backdrop to hide the popover
-  await page.locator('.filter-popover').locator('ion-backdrop').click();
+  await popover.locator('ion-backdrop').click();
+  await expect(popover).toBeHidden();
 }
 
 msTest('Filter users list', async ({ usersPage }) => {