fix: add redirecting to field report listing page in playwright tests

IFRCGo · Dec 3, 2024 · 5dfdc7e · 5dfdc7e
1 parent 6a398bb
commit 5dfdc7e
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 15 deletions.
diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml
@@ -2,7 +2,7 @@ name: Playwright
 
 env:
   PLAYWRIGHT_APP_BASE_URL: ${{ vars.PLAYWRIGHT_APP_BASE_URL }}
-  PLAYWRIGHT_USER_NAME: ${{ secrets.PLAYWRIGHT_USER_NAME }}
+  PLAYWRIGHT_USER_EMAIL: ${{ secrets.PLAYWRIGHT_USER_EMAIL }}
   PLAYWRIGHT_USER_PASSWORD: ${{ secrets.PLAYWRIGHT_USER_PASSWORD }}
 
 on:

diff --git a/packages/e2e-tests/.env.example b/packages/e2e-tests/.env.example
@@ -1,6 +1,6 @@
 # Base URL for the application where Playwright will run tests
 PLAYWRIGHT_APP_BASE_URL=
 # User name of the test user for Playwright
-PLAYWRIGHT_USER_NAME=
+PLAYWRIGHT_USER_EMAIL=
 # Password of the test user for Playwright
 PLAYWRIGHT_USER_PASSWORD=
diff --git a/packages/e2e-tests/tests/auth.setup.ts b/packages/e2e-tests/tests/auth.setup.ts
@@ -4,12 +4,12 @@ const authFile = 'playwright/.auth/user.json';
 
 setup('authenticate', async ({ page }) => {
     if (
-        process.env.PLAYWRIGHT_USER_NAME &&
+        process.env.PLAYWRIGHT_USER_EMAIL &&
         process.env.PLAYWRIGHT_USER_PASSWORD
     ) {
         await login(
             page,
-            process.env.PLAYWRIGHT_USER_NAME,
+            process.env.PLAYWRIGHT_USER_EMAIL,
             process.env.PLAYWRIGHT_USER_PASSWORD,
         );
     }

diff --git a/packages/e2e-tests/tests/earlyWarning/earlyWarning.spec.ts b/packages/e2e-tests/tests/earlyWarning/earlyWarning.spec.ts
@@ -265,6 +265,8 @@ test.describe('Field Report', () => {
             .filter({ hasText: visibiltyOptTwo })
             .click();
         await page.getByRole('button', { name: 'Submit' }).click();
+        // Wait for redirection to field reports listing page
+        await page.waitForURL(/\/field-reports\/\d+/);
         await expect(page.locator('h1')).toContainText(
             `${newtitle} - ${title}`,
         );

diff --git a/packages/e2e-tests/tests/epidemic-field-report/epidemic-field-report.spec.ts b/packages/e2e-tests/tests/epidemic-field-report/epidemic-field-report.spec.ts
@@ -252,9 +252,8 @@ test.describe('Field report flow', async () => {
             .filter({ hasText: visibiltyOptTwo })
             .click();
         await page.getByRole('button', { name: 'Submit' }).click();
-        await expect(page.locator('body')).toContainText(
-            'Field report updated, redirecting...',
-        );
+        // Wait for redirection to field reports listing page
+        await page.waitForURL(/\/field-reports\/\d+/);
         // Title Assertion
         await expect(page.locator('h1')).toContainText(
             `${newtitle} - ${title}`,

diff --git a/packages/e2e-tests/tests/field-report/fieldReport.spec.ts b/packages/e2e-tests/tests/field-report/fieldReport.spec.ts
@@ -266,9 +266,8 @@ test.describe('Field Report', () => {
             .filter({ hasText: visibiltyOptTwo })
             .click();
         await page.getByRole('button', { name: 'Submit' }).click();
-        await expect(page.locator('body')).toContainText(
-            'Field report updated, redirecting...',
-        );
+        // Wait for redirection to field reports listing page
+        await page.waitForURL(/\/field-reports\/\d+/);
         // Title Assertion
         await expect(page.locator('h1')).toContainText(
             `${newtitle} - ${title}`,

diff --git a/packages/e2e-tests/tests/loginLogout.spec.ts b/packages/e2e-tests/tests/loginLogout.spec.ts
@@ -3,7 +3,7 @@ import { login } from '#utils/auth';
 test('should login', async ({ page }) => {
     await login(
         page,
-        process.env.PLAYWRIGHT_USER_NAME,
+        process.env.PLAYWRIGHT_USER_EMAIL,
         process.env.PLAYWRIGHT_USER_PASSWORD,
     );
     await page.waitForURL('/');
@@ -15,13 +15,12 @@ test('should login', async ({ page }) => {
 test('should logout', async ({ page }) => {
     await login(
         page,
-        process.env.PLAYWRIGHT_USER_NAME,
+        process.env.PLAYWRIGHT_USER_EMAIL,
         process.env.PLAYWRIGHT_USER_PASSWORD,
     );
     await page.waitForURL('/');
-    await page
-        .getByRole('button', { name: process.env.PLAYWRIGHT_USER_NAME })
-        .click();
+    const name = process.env.PLAYWRIGHT_USER_EMAIL.match(/^[^@]+(?=@)/);
+    await page.getByRole('button', { name: name[0] }).click();
     await page.getByRole('button', { name: 'Logout' }).click();
     await page.getByRole('button', { name: 'Ok' }).click();
     await expect(page.getByRole('navigation')).toContainText('Login');