clean ups and improve paths

Altinn · Dec 11, 2023 · 4a9975f · 4a9975f
1 parent 2b7a99e
commit 4a9975f
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 8 deletions.
diff --git a/frontend/testing/.eslintignore b/frontend/testing/.eslintignore
diff --git a/frontend/testing/playwright/helpers/Routes.ts b/frontend/testing/playwright/helpers/Routes.ts
@@ -1,4 +1,4 @@
 export class Routes {
-    public readonly loginPage: string = "/";
+    public readonly altinnLoginPage: string = "/";
     public readonly dashboard: string = "/dashboard";
 }
diff --git a/frontend/testing/playwright/helpers/routeUtils.ts b/frontend/testing/playwright/helpers/routeUtils.ts
diff --git a/...d/testing/playwright/altinnStudio.spec.ts → ...aywright/integration/altinnStudio.spec.ts b/...d/testing/playwright/altinnStudio.spec.ts → ...aywright/integration/altinnStudio.spec.ts
diff --git a/...end/testing/playwright/Pages/LoginPage.ts → ...end/testing/playwright/pages/LoginPage.ts b/...end/testing/playwright/Pages/LoginPage.ts → ...end/testing/playwright/pages/LoginPage.ts
@@ -9,7 +9,7 @@ export class LoginPage extends BasePage {
     }
 
     public async goToAltinnLoginPage(): Promise<void> {
-        await this._page.goto(this.loginPage);
+        await this._page.goto(this.altinnLoginPage);
     }
 
     public async goToGiteaLoginPage(): Promise<void> {

diff --git a/playwright.config.ts → ...d/testing/playwright/playwright.config.ts b/playwright.config.ts → ...d/testing/playwright/playwright.config.ts
@@ -4,7 +4,7 @@ import { config } from 'dotenv';
 config();
 
 export default defineConfig({
-  testDir: './frontend/testing/playwright',
+  testDir: './integration',
   fullyParallel: true,
   forbidOnly: !!process.env.CI,
   retries: process.env.CI ? 2 : 0,

diff --git a/package.json b/package.json
@@ -106,7 +106,7 @@
     "test": "jest --maxWorkers=50% --config=frontend/jest.config.js",
     "test:ci": "jest --ci --coverage --max-workers=2 --cacheDirectory=$(yarn config get cacheFolder) --config=frontend/jest.config.js",
     "typecheck": "yarn workspaces foreach -A run typecheck",
-    "playwright-e2e": "playwright test"
+    "playwright-e2e": "playwright test --config ./frontend/testing/playwright/playwright.config.ts"
   },
   "syncpack": {
     "semverRange": ""