feat: move/update/fix tests

Signed-off-by: Raphael Arce <[email protected]>
technologiestiftung · Oct 11, 2024 · a26e555 · a26e555
1 parent b9ebff8
commit a26e555
Show file tree

Hide file tree

Showing 20 changed files with 146 additions and 108 deletions.
diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
@@ -4,9 +4,9 @@ permissions:
   packages: write
 on:
   push:
-    branches: [main]
+    branches: [main, staging]
   pull_request:
-    branches: [main]
+    branches: [main, staging]
   workflow_dispatch:
     inputs:
       debug_enabled:

diff --git a/.gitignore b/.gitignore
@@ -25,7 +25,7 @@ dist-ssr
 *.njsproj
 *.sln
 *.sw?
-/test-results/
+**/test-results/
 /playwright-report/
 /blob-report/
 /playwright/.cache/
diff --git a/package.json b/package.json
@@ -11,8 +11,8 @@
 		"prettier:ci": "prettier --check .",
 		"preview": "vite preview",
 		"test": "npm run test:unit && npm run test:e2e",
-		"test:unit": "vitest run",
-		"test:e2e": "playwright test"
+		"test:unit": "vitest run --config ./tests/unit/vitest.config.ts",
+		"test:e2e": "playwright test --config=tests/e2e/playwright.config.ts"
 	},
 	"dependencies": {
 		"@supabase/supabase-js": "2.43.1",

diff --git a/src/tests/e2e/auth/_setup.test.ts → tests/e2e/_setup.test.ts b/src/tests/e2e/auth/_setup.test.ts → tests/e2e/_setup.test.ts
@@ -1,6 +1,5 @@
 import { expect, test } from "@playwright/test";
 import {
-	baseUrl,
 	defaultEmail,
 	defaultInbucketEmailUsername,
 	defaultPassword,
@@ -13,7 +12,6 @@ import {
 
 test.describe("Setup", () => {
 	test("should check if all environment/default variables are set", () => {
-		expect(baseUrl).toBeDefined();
 		expect(supabaseApiUrl).not.toBe("");
 		expect(supabaseAnonKey).not.toBe("");
 		expect(inbucketUrl).not.toBe("");

diff --git a/src/tests/e2e/auth/edit-user.test.ts → tests/e2e/auth/edit-user.test.ts b/src/tests/e2e/auth/edit-user.test.ts → tests/e2e/auth/edit-user.test.ts
@@ -5,7 +5,6 @@ import {
 	registerThenLoginWithDefaultAccount,
 } from "./utils.ts";
 import {
-	baseUrl,
 	changedEmail,
 	changedInbucketEmailUsername,
 	defaultEmail,
@@ -14,20 +13,20 @@ import {
 	defaultUsername,
 	inbucketUrl,
 	supabaseClient,
-} from "./constants.ts";
+} from "../constants.ts";
 
 test.describe("Edit user", () => {
 	test.describe("Edit Username", () => {
-		test.beforeEach(async ({ page }) => {
-			await registerThenLoginWithDefaultAccount(page);
+		test.beforeEach(async ({ page, isMobile }) => {
+			await registerThenLoginWithDefaultAccount({ page, isMobile });
 		});
 
 		test.afterEach(async () => {
 			await deleteDefaultAccount();
 		});
 
 		test("should be able to edit username", async ({ page }) => {
-			await page.goto(`${baseUrl}/profile`);
+			await page.goto(`/profile`);
 
 			await page
 				.locator("div")
@@ -47,16 +46,16 @@ test.describe("Edit user", () => {
 	});
 
 	test.describe("Edit Email", () => {
-		test.beforeEach(async ({ page }) => {
-			await registerThenLoginWithDefaultAccount(page);
+		test.beforeEach(async ({ page, isMobile }) => {
+			await registerThenLoginWithDefaultAccount({ page, isMobile });
 		});
 
 		test.afterEach(async () => {
 			await deleteChangedEmailAccount();
 		});
 
 		test("should be able to edit e-mail", async ({ page }) => {
-			await page.goto(`${baseUrl}/profile`);
+			await page.goto(`/profile`);
 
 			await page
 				.locator("div")
@@ -87,16 +86,16 @@ test.describe("Edit user", () => {
 	});
 
 	test.describe("Edit password", () => {
-		test.beforeEach(async ({ page }) => {
-			await registerThenLoginWithDefaultAccount(page);
+		test.beforeEach(async ({ page, isMobile }) => {
+			await registerThenLoginWithDefaultAccount({ page, isMobile });
 		});
 
 		test.afterEach(async () => {
 			await deleteDefaultAccount();
 		});
 
 		test("should be able to edit password", async ({ page }) => {
-			await page.goto(`${baseUrl}/profile`);
+			await page.goto(`/profile`);
 
 			await page.getByRole("button", { name: "Passwort ändern" }).click();
 			await page.getByRole("button", { name: "OK" }).click();
@@ -114,12 +113,12 @@ test.describe("Edit user", () => {
 	});
 
 	test.describe("Delete account", () => {
-		test.beforeEach(async ({ page }) => {
-			await registerThenLoginWithDefaultAccount(page);
+		test.beforeEach(async ({ page, isMobile }) => {
+			await registerThenLoginWithDefaultAccount({ page, isMobile });
 		});
 
 		test("should be able to delete account", async ({ page }) => {
-			await page.goto(`${baseUrl}/profile`);
+			await page.goto(`/profile`);
 
 			await page.getByRole("button", { name: "Account löschen" }).click();
 			await page.getByRole("button", { name: "Löschen", exact: true }).click();

diff --git a/src/tests/e2e/auth/forgot-password.test.ts → tests/e2e/auth/forgot-password.test.ts b/src/tests/e2e/auth/forgot-password.test.ts → tests/e2e/auth/forgot-password.test.ts
@@ -5,24 +5,23 @@ import {
 	registerThenLogoutWithDefaultAccount,
 } from "./utils";
 import {
-	baseUrl,
 	defaultEmail,
 	defaultInbucketEmailUsername,
 	defaultPassword,
 	inbucketUrl,
-} from "./constants";
+} from "../constants";
 
 test.describe("Forgot password", () => {
 	test.describe("Happy Case", () => {
-		test.beforeEach(async ({ page }) => {
-			await registerThenLogoutWithDefaultAccount(page);
+		test.beforeEach(async ({ page, isMobile }) => {
+			await registerThenLogoutWithDefaultAccount({ page, isMobile });
 		});
 		test.afterEach(async () => {
 			await deleteDefaultAccount();
 		});
 
 		test("should be able to reset password via e-mail", async ({ page }) => {
-			await page.goto(`${baseUrl}/profile`);
+			await page.goto(`/profile`);
 			await page.getByRole("link", { name: "Passwort vergessen?" }).click();
 			await page.getByLabel("E-Mail").click();
 			await page.getByLabel("E-Mail").fill(defaultEmail);
@@ -59,7 +58,7 @@ test.describe("Forgot password", () => {
 		test("should not be able to reset password with empty email", async ({
 			page,
 		}) => {
-			await page.goto(`${baseUrl}/profile`);
+			await page.goto(`/profile`);
 			await page.getByRole("link", { name: "Passwort vergessen?" }).click();
 
 			await page.getByLabel("E-Mail").click();
@@ -72,7 +71,7 @@ test.describe("Forgot password", () => {
 		test("should not be able to reset password with invalid email format", async ({
 			page,
 		}) => {
-			await page.goto(`${baseUrl}/profile`);
+			await page.goto(`/profile`);
 			await page.getByRole("link", { name: "Passwort vergessen?" }).click();
 
 			await page.getByLabel("E-Mail").click();
@@ -84,7 +83,7 @@ test.describe("Forgot password", () => {
 		test('should not be able to reset password by going on "profile/reset-password" directly', async ({
 			page,
 		}) => {
-			await page.goto(`${baseUrl}/profile/reset-password`);
+			await page.goto(`/profile/reset-password`);
 
 			await page.goto("http://localhost:5173/profile/reset-password");
 			await expect(
@@ -100,7 +99,7 @@ test.describe("Forgot password", () => {
 				page.getByText("Hinweis: Diese Seite kann nur"),
 			).toBeVisible();
 			await page.getByRole("button", { name: "Zurück zur Startseite" }).click();
-			await expect(page).toHaveURL(new RegExp(`${baseUrl}/map.*`));
+			await expect(page).toHaveURL(new RegExp(`/map.*`));
 		});
 	});
 
@@ -112,7 +111,7 @@ test.describe("Forgot password", () => {
 				const browserContext = await browser.newContext();
 				const page = await browserContext.newPage();
 
-				await page.goto(`${baseUrl}/profile`);
+				await page.goto(`/profile`);
 				await page.getByRole("link", { name: "Passwort vergessen?" }).click();
 
 				await page.getByLabel("E-Mail").click();
@@ -129,8 +128,8 @@ test.describe("Forgot password", () => {
 		});
 
 		test.describe("Reset password page", () => {
-			test.beforeEach(async ({ page }) => {
-				await registerThenLogoutWithDefaultAccount(page);
+			test.beforeEach(async ({ page, isMobile }) => {
+				await registerThenLogoutWithDefaultAccount({ page, isMobile });
 			});
 			test.afterEach(async () => {
 				await deleteDefaultAccount();
@@ -142,7 +141,7 @@ test.describe("Forgot password", () => {
 				const browserContext = await browser.newContext();
 				const page = await browserContext.newPage();
 
-				await page.goto(`${baseUrl}/profile`);
+				await page.goto(`/profile`);
 				await page.getByRole("link", { name: "Passwort vergessen?" }).click();
 				await page.getByLabel("E-Mail").click();
 				await page.getByLabel("E-Mail").fill(defaultEmail);

diff --git a/src/tests/e2e/auth/login.test.ts → tests/e2e/auth/login.test.ts b/src/tests/e2e/auth/login.test.ts → tests/e2e/auth/login.test.ts
@@ -3,19 +3,19 @@ import {
 	deleteDefaultAccount,
 	registerThenLogoutWithDefaultAccount,
 } from "./utils";
-import { baseUrl, defaultEmail, defaultPassword } from "./constants";
+import { defaultEmail, defaultPassword } from "../constants";
 
 test.describe("Login", () => {
 	test.describe("Happy Case", () => {
-		test.beforeEach(async ({ page }) => {
-			await registerThenLogoutWithDefaultAccount(page);
+		test.beforeEach(async ({ page, isMobile }) => {
+			await registerThenLogoutWithDefaultAccount({ page, isMobile });
 		});
 		test.afterEach(async () => {
 			await deleteDefaultAccount();
 		});
 
 		test("should be able to log-in then log-out", async ({ page }) => {
-			await page.goto(`${baseUrl}/map`);
+			await page.goto(`/map`);
 
 			// Go to profile
 			await page.getByRole("link", { name: "Profil" }).click();
@@ -39,7 +39,7 @@ test.describe("Login", () => {
 
 	test.describe("Client-Side Validation", () => {
 		test("should not be able to log-in with empty email", async ({ page }) => {
-			await page.goto(`${baseUrl}/profile`);
+			await page.goto(`/profile`);
 
 			await page.getByLabel("E-Mail").click();
 			await page.getByLabel("E-Mail").fill(" ");
@@ -54,7 +54,7 @@ test.describe("Login", () => {
 		test("should not be able to log-in with invalid email format", async ({
 			page,
 		}) => {
-			await page.goto(`${baseUrl}/profile`);
+			await page.goto(`/profile`);
 
 			await page.getByLabel("E-Mail").click();
 			await page.getByLabel("E-Mail").fill("invalid-email");
@@ -68,7 +68,7 @@ test.describe("Login", () => {
 		test("should not be able to log-in with empty password", async ({
 			page,
 		}) => {
-			await page.goto(`${baseUrl}/profile`);
+			await page.goto(`/profile`);
 
 			await page.getByLabel("E-Mail").click();
 			await page.getByLabel("E-Mail").fill("invalid-email");
@@ -85,7 +85,7 @@ test.describe("Login", () => {
 		test("should not be able to log-in with wrong email/password credentials", async ({
 			page,
 		}) => {
-			await page.goto(`${baseUrl}/profile`);
+			await page.goto(`/profile`);
 
 			await page.getByLabel("E-Mail").click();
 			await page.getByLabel("E-Mail").fill("[email protected]");
@@ -108,7 +108,7 @@ test.describe("Login", () => {
 			const browserContext = await browser.newContext();
 			const page = await browserContext.newPage();
 
-			await page.goto(`${baseUrl}/profile`);
+			await page.goto(`/profile`);
 
 			await page.getByLabel("E-Mail").click();
 			await page.getByLabel("E-Mail").fill(defaultEmail);