updated login tests and helpers

Author: Rad14nt

client/tests/e2e/1-user-account/1.1-create-add.spec.ts

@@ -4,6 +4,7 @@ import {
     generateUniqueUsername,
     navigateTo,
     selectVuetifyOptionByName,
+    expectToHaveUrl,
 } from "../utils/helpers";
 
 async function setupCreateUserAccountPage(page: Page) {
@@ -15,12 +16,10 @@ async function setupCreateUserAccountPage(page: Page) {
     const institutionSelectLocator = page.getByTestId(
         "createUserAccount-institution-select",
     );
-
     const roleSelectLocator = page.getByTestId("createUserAccount-role-select");
 
     // fields
     const usernameLocator = page.getByLabel(/username/i);
-
     const nameLocator = page
         .getByTestId("createUserAccount-name-input")
         .getByRole("textbox");
@@ -38,6 +37,7 @@ async function setupCreateUserAccountPage(page: Page) {
         .getByTestId("createUserAccount-confirmPassword-input")
         .getByRole("textbox");
 
+    // buttons
     const saveButtonLocator = page.getByTestId("createUserAccount-save-button");
     const cancelButtonLocator = page.getByTestId(
         "createUserAccount-cancel-button",
@@ -57,12 +57,6 @@ async function setupCreateUserAccountPage(page: Page) {
     };
 }
 
-async function expectSuccessfulCreateRedirect(page: Page) {
-    await expect(page).toHaveURL(/\/user-accounts(?:$|[?#])/i, {
-        timeout: 10_000,
-    });
-}
-
 //TODO this test was left with kinda big redundancies to explain to the apprentices in simple terms what is going on. Small refactor later
 test.describe("1.1 User Accounts - CREATE Add", () => {
     test.beforeEach(async ({ page }) => {
@@ -160,7 +154,7 @@ test.describe("1.1 User Accounts - CREATE Add", () => {
 
         expect(actualPayload).toMatchObject(expectedPayload);
 
-        await expectSuccessfulCreateRedirect(page);
+        await expectToHaveUrl(page, "user-accounts");
 
         //note that this test does not test if the backend actually saves the data correctly. This could be done in 2 ways:
         // 1: Navigate to User accounts, search for the username entered in the test, and look at the details - This however creates a dependency on get all, and get by id working. If one of those is broken, this test would fail too
@@ -243,7 +237,7 @@ test.describe("1.1 User Accounts - CREATE Add", () => {
         );
 
         // expected to not change URL
-        await expect(page).toHaveURL(/\/user-accounts\/create(?:$|[?#])/i);
+        await expectToHaveUrl(page, "user-accounts/create");
     });
 
     test("C Server Error - user account already exists (duplicate username)", async ({
@@ -313,8 +307,7 @@ test.describe("1.1 User Accounts - CREATE Add", () => {
         expect(createResponse.status()).toBe(400);
         expect(createResponse.ok()).toBeFalsy();
 
-        await expect(page).toHaveURL(/\/user-accounts\/create(?:$|[?#])/i);
-
+        await expectToHaveUrl(page, "user-accounts/create");
         //check toast
         const toast = page.locator(".toast-item[role='alert']");
 

client/tests/e2e/1-user-account/1.2-create-register.spec.ts

@@ -5,6 +5,9 @@ import {
     selectVuetifyOptionByName,
 } from "../utils/helpers";
 
+// broken atm
+// TODO use expectToHaveUrl helper and othees
+
 // Setup Method for page
 async function setupRegisterPage(page: Page) {
     await page.addInitScript(() => {

client/tests/e2e/1-user-account/2.1-read-login.spec.ts

@@ -1,19 +1,15 @@
 import { test, expect, Page } from "@playwright/test";
 import { loginAsServerAdmin } from "../utils/authenticate";
+import { clearLocalAndSessionStorage, navigateTo } from "../utils/helpers";
 
 const correctUser = "testmain";
 const correctPass = "testmain";
-const wrongUser = "invalid@example.cdasdpef";
+const wrongUser = "invalid@example.cdasdpef_#!@#!DFFADFA||>>:P";
 const wrongPass = "wrong-passworddddddddddddddd";
 
 async function setupLoginPage(page: Page) {
-    await page.addInitScript(() => {
-        localStorage.clear();
-        sessionStorage.clear();
-    });
-    await page.goto("/");
     await expect(page.getByTestId("login-page-container")).toBeVisible();
-
+    //fields definition
     const username = page.getByRole("textbox", { name: "Username *" });
     const password = page.getByRole("textbox", { name: "Password *" });
 
@@ -28,6 +24,11 @@ test.use({
 });
 
 test.describe("1.2.1 User Accounts - READ Log in", () => {
+    test.beforeEach(async ({ page }) => {
+        await clearLocalAndSessionStorage(page);
+        await navigateTo(page, "/");
+    });
+
     test("A Successful login", async ({ page }) => {
         await loginAsServerAdmin(page, correctUser, correctPass);
     });
@@ -44,23 +45,4 @@ test.describe("1.2.1 User Accounts - READ Log in", () => {
         await expect(alert).toHaveCount(1);
         await page.waitForTimeout(600);
     });
-
-    test("C Navigates to Register", async ({ page }) => {
-        await page.goto("/");
-
-        const link = page.getByTestId("login-register-link");
-
-        await link.click();
-        await expect(page).toHaveURL(/register/);
-
-        await page.goto("/");
-        await link.focus();
-        await page.keyboard.press("Enter");
-        await expect(page).toHaveURL(/register/);
-
-        await page.goto("/");
-        await link.focus();
-        await page.keyboard.press(" ");
-        await expect(page).toHaveURL(/register/);
-    });
 });

client/tests/e2e/utils/authenticate.ts

@@ -1,4 +1,5 @@
 import { expect, Page } from "@playwright/test";
+import { expectToHaveUrl, navigateTo } from "./helpers";
 
 const SEB_SERVER_ADMIN_USERNAME = "testmain";
 const SEB_SERVER_ADMIN_PASSWORD = "testmain";
@@ -8,7 +9,8 @@ export async function loginAsServerAdmin(
     username: string = SEB_SERVER_ADMIN_USERNAME,
     password: string = SEB_SERVER_ADMIN_PASSWORD,
 ) {
-    await page.goto("/");
+    await navigateTo(page, "/");
+
     await expect(page.getByTestId("login-page-container")).toBeVisible();
 
     const usernameField = page.getByRole("textbox", { name: "Username *" });
@@ -19,7 +21,5 @@ export async function loginAsServerAdmin(
 
     await page.keyboard.press("Enter");
 
-    await expect(page).toHaveURL(/\/home(?:$|[?#])/i, {
-        timeout: 10_000,
-    });
+    await expectToHaveUrl(page, "home");
 }

client/tests/e2e/utils/helpers.ts

@@ -69,3 +69,18 @@ export async function selectVuetifyFirstOption(
 export async function navigateTo(page: Page, route: string) {
     await page.goto(route);
 }
+
+export async function clearLocalAndSessionStorage(page: Page) {
+    await page.addInitScript(() => {
+        localStorage.clear();
+        sessionStorage.clear();
+    });
+}
+
+export async function expectToHaveUrl(page: Page, path: string) {
+    const regex = new RegExp(`\\/${path}(?:$|[?#])`, "i");
+
+    await expect(page).toHaveURL(regex, {
+        timeout: 10_000,
+    });
+}