[MS] Added e2e tests for greet/join user

Scille · Jan 22, 2025 · 0973246 · 0973246
1 parent d88880d
commit 0973246
Show file tree

Hide file tree

Showing 6 changed files with 256 additions and 202 deletions.
diff --git a/client/playwright.config.ts b/client/playwright.config.ts
@@ -40,7 +40,6 @@ export default defineConfig({
   testIgnore: [
     '**/device_greet.spec.ts',
     '**/device_join_organization.spec.ts',
-    '**/user_greet.spec.ts',
     '**/user_join.spec.ts',
     '**/create_organization*.spec.ts',
     '**/workspace_sharing.spec.ts',

diff --git a/client/src/views/users/GreetUserModal.vue b/client/src/views/users/GreetUserModal.vue
@@ -50,7 +50,7 @@
         <!-- give code step -->
         <div
           v-show="pageStep === GreetUserStep.ProvideHostSasCode"
-          class="step"
+          class="step host-code"
         >
           <sas-code-provide :code="greeter.hostSASCode" />
         </div>

diff --git a/client/tests/e2e/helpers/fixtures.ts b/client/tests/e2e/helpers/fixtures.ts
@@ -1,6 +1,6 @@
 // Parsec Cloud (https://parsec.cloud) Copyright (c) BUSL-1.1 2016-present Scille SAS
 
-import { Locator, Page, TestInfo, test as base } from '@playwright/test';
+import { BrowserContext, Locator, Page, TestInfo, test as base } from '@playwright/test';
 import { expect } from '@tests/e2e/helpers/assertions';
 import { MockBms } from '@tests/e2e/helpers/bms';
 import { DEFAULT_ORGANIZATION_INFORMATION, DEFAULT_USER_INFORMATION, UserData } from '@tests/e2e/helpers/data';
@@ -9,7 +9,9 @@ import { createWorkspace, dismissToast, dragAndDropFile, fillInputModal, fillIon
 import path from 'path';
 
 export const msTest = base.extend<{
+  context: BrowserContext;
   home: Page;
+  secondTab: Page;
   connected: Page;
   workspaces: Page;
   documents: Page;
@@ -25,7 +27,36 @@ export const msTest = base.extend<{
   clientArea: Page;
   clientAreaCustomOrder: Page;
 }>({
-  home: async ({ page, context }, use) => {
+  context: async ({ browser }, use) => {
+    const context = await browser.newContext();
+    await use(context);
+    await context.close();
+  },
+
+  home: async ({ context }, use) => {
+    const page = await context.newPage();
+
+    page.on('console', (msg) => console.log('> ', msg.text()));
+    await context.grantPermissions(['clipboard-read']);
+
+    await page.addInitScript(() => {
+      (window as any).TESTING = true;
+    });
+    await page.goto('/');
+    await page.waitForLoadState('domcontentloaded');
+
+    await expect(page.locator('#app')).toHaveAttribute('app-state', 'initializing');
+
+    await newTestbed(page);
+
+    await expect(page.locator('#app')).toHaveAttribute('app-state', 'ready');
+    await use(page);
+    await dropTestbed(page);
+  },
+
+  secondTab: async ({ context }, use) => {
+    const page = await context.newPage();
+
     page.on('console', (msg) => console.log('> ', msg.text()));
     await context.grantPermissions(['clipboard-read']);
 

diff --git a/client/tests/e2e/helpers/utils.ts b/client/tests/e2e/helpers/utils.ts
@@ -54,9 +54,7 @@ export async function fillInputModal(root: Locator | Page, text: string, clear?:
     await fillIonInput(modal.locator('ion-input'), '');
   }
   const okButton = modal.locator('.ms-modal-footer-buttons').locator('#next-button');
-  await expect(okButton).toHaveDisabledAttribute();
   await fillIonInput(modal.locator('ion-input'), text);
-  await expect(okButton).not.toHaveDisabledAttribute();
   await okButton.click();
   await expect(modal).toBeHidden();
 }