From 5e9c7e9bfe5e6176ba7cc1b5d1fadcef1425866f Mon Sep 17 00:00:00 2001 From: ISA Date: Thu, 14 Aug 2025 16:20:42 +0200 Subject: [PATCH] playwright: test Reihenfolge --- .env.development | 2 +- .env.production | 2 +- CHANGELOG.md | 5 + package-lock.json | 4 +- package.json | 2 +- playwright/tests/analogInputsTest.ts | 466 +++++++++++++-------------- playwright/tests/dashboardTest.ts | 10 +- 7 files changed, 236 insertions(+), 255 deletions(-) diff --git a/.env.development b/.env.development index 2f5fa66..09779ea 100644 --- a/.env.development +++ b/.env.development @@ -6,6 +6,6 @@ NEXT_PUBLIC_USE_MOCK_BACKEND_LOOP_START=false NEXT_PUBLIC_EXPORT_STATIC=false NEXT_PUBLIC_USE_CGI=false # App-Versionsnummer -NEXT_PUBLIC_APP_VERSION=1.6.726 +NEXT_PUBLIC_APP_VERSION=1.6.727 NEXT_PUBLIC_CPL_MODE=json # json (Entwicklungsumgebung) oder jsSimulatedProd (CPL ->CGI-Interface-Simulator) oder production (CPL-> CGI-Interface Platzhalter) diff --git a/.env.production b/.env.production index cbf9ecb..95c2377 100644 --- a/.env.production +++ b/.env.production @@ -5,5 +5,5 @@ NEXT_PUBLIC_CPL_API_PATH=/CPL NEXT_PUBLIC_EXPORT_STATIC=true NEXT_PUBLIC_USE_CGI=true # App-Versionsnummer -NEXT_PUBLIC_APP_VERSION=1.6.726 +NEXT_PUBLIC_APP_VERSION=1.6.727 NEXT_PUBLIC_CPL_MODE=production \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 00854a4..d4b11b5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## [1.6.727] – 2025-08-14 + +- playwright: Reihenfolge + +--- ## [1.6.726] – 2025-08-14 - playwright: dashboard diff --git a/package-lock.json b/package-lock.json index 2cb29a9..f82f477 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "cpl-v4", - "version": "1.6.726", + "version": "1.6.727", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "cpl-v4", - "version": "1.6.726", + "version": "1.6.727", "dependencies": { "@fontsource/roboto": "^5.1.0", "@headlessui/react": "^2.2.4", diff --git a/package.json b/package.json index 8a9616b..8f8d46b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cpl-v4", - "version": "1.6.726", + "version": "1.6.727", "private": true, "scripts": { "dev": "next dev", diff --git a/playwright/tests/analogInputsTest.ts b/playwright/tests/analogInputsTest.ts index d8c68c0..da45eac 100644 --- a/playwright/tests/analogInputsTest.ts +++ b/playwright/tests/analogInputsTest.ts @@ -1,294 +1,270 @@ -import { test, expect } from "../fixtures"; +import { expect } from "../fixtures"; import type { Locator, Page } from "@playwright/test"; -export async function runAnalogInputsTest(page: Page) { - // Kombinierte Helper-Funktion: injiziert CSS (nur einmal), hebt hervor und prüft Sichtbarkeit - async function highlightAndExpectVisible( - page: Page, - locator: Locator, - durationMs = 800 - ) { - // CSS nur einmal pro Page injizieren - if (!(await page.evaluate(() => (window as any).__pwForceCssInjected))) { - await page.addStyleTag({ - content: ` - .pw-force-outline { outline: 3px solid #ff1744 !important; outline-offset: 2px !important; box-shadow: 0 0 0 3px rgba(224,0,43,.35) !important; } - `, - }); - await page.evaluate(() => { - (window as any).__pwForceCssInjected = true; - }); - } - const els = await locator.elementHandles(); - for (const el of els) { - await el.evaluate((node: unknown, ms: number) => { - const n = node as HTMLElement; - n.classList.add("pw-force-outline"); - window.setTimeout(() => n.classList.remove("pw-force-outline"), ms); - }, durationMs); - } - await expect(locator).toBeVisible(); +// Kombinierte Helper-Funktion: injiziert CSS (nur einmal), hebt hervor und prüft Sichtbarkeit +async function highlightAndExpectVisible( + page: Page, + locator: Locator, + durationMs = 800 +) { + // CSS nur einmal pro Page injizieren + if (!(await page.evaluate(() => (window as any).__pwForceCssInjected))) { + await page.addStyleTag({ + content: ` + .pw-force-outline { outline: 3px solid #ff1744 !important; outline-offset: 2px !important; box-shadow: 0 0 0 3px rgba(224,0,43,.35) !important; } + `, + }); + await page.evaluate(() => { + (window as any).__pwForceCssInjected = true; + }); } + const els = await locator.elementHandles(); + for (const el of els) { + await el.evaluate((node: unknown, ms: number) => { + const n = node as HTMLElement; + n.classList.add("pw-force-outline"); + window.setTimeout(() => n.classList.remove("pw-force-outline"), ms); + }, durationMs); + } + await expect(locator).toBeVisible(); +} - /* - import { test, expect } from "../fixtures"; - npx playwright codegen http://localhost:3000/analogInputs --target=ts -o tests/e2e/analog-inputs.spec.ts - ob ein Element sichtbar ist dann Auge Icon klicken - ansonsten nimmt automatich die klicks auf - //---------------------------------------------- - Zum ausführen - - alle Test datei , je nach dem wie in package.json definiert ist - npm run test:e2e:ui - - bestimmte datei - npm run test:e2e:ui -- tests/analogInputs.spec.ts - npm run test:e2e:ui -- tests/e2e/analog-inputs.spec.ts - */ +export async function runAnalogInputsTest(page: Page) { + await page.goto("/analogInputs"); + await highlightAndExpectVisible( + page, + page.getByRole("heading", { name: "Messwerteingänge" }).nth(1) + ); + await highlightAndExpectVisible( + page, + page.getByRole("cell", { name: "Eingang" }) + ); + // ...existing code... - test.slow(); - test("Messwerteingänge", async ({ page }) => { - await page.goto("/analogInputs"); + await highlightAndExpectVisible( + page, + page.getByRole("cell", { name: "Messwert" }) + ); - await highlightAndExpectVisible( - page, - page.getByRole("heading", { name: "Messwerteingänge" }).nth(1) - ); + await highlightAndExpectVisible( + page, + page.getByRole("cell", { name: "Einheit" }) + ); - await highlightAndExpectVisible( - page, - page.getByRole("cell", { name: "Eingang" }) - ); + await highlightAndExpectVisible( + page, + page.getByRole("cell", { name: "Bezeichnung" }) + ); - await highlightAndExpectVisible( - page, - page.getByRole("cell", { name: "Messwert" }) - ); + await highlightAndExpectVisible( + page, + page.getByRole("cell", { name: "Einstellungen" }) + ); - await highlightAndExpectVisible( - page, - page.getByRole("cell", { name: "Einheit" }) - ); + await highlightAndExpectVisible( + page, + page.getByRole("cell", { name: "Messkurve", exact: true }) + ); - await highlightAndExpectVisible( - page, - page.getByRole("cell", { name: "Bezeichnung" }) - ); + await highlightAndExpectVisible(page, page.getByText("1", { exact: true })); - await highlightAndExpectVisible( - page, - page.getByRole("cell", { name: "Einstellungen" }) - ); + await highlightAndExpectVisible(page, page.getByText("2", { exact: true })); - await highlightAndExpectVisible( - page, - page.getByRole("cell", { name: "Messkurve", exact: true }) - ); + await highlightAndExpectVisible(page, page.getByText("3", { exact: true })); - await highlightAndExpectVisible(page, page.getByText("1", { exact: true })); + await highlightAndExpectVisible( + page, + page.getByRole("cell", { name: "4", exact: true }).locator("path") + ); - await highlightAndExpectVisible(page, page.getByText("2", { exact: true })); + await highlightAndExpectVisible( + page, + page.getByRole("cell", { name: "5", exact: true }) + ); - await highlightAndExpectVisible(page, page.getByText("3", { exact: true })); + await highlightAndExpectVisible(page, page.getByText("6", { exact: true })); - await highlightAndExpectVisible( - page, - page.getByRole("cell", { name: "4", exact: true }).locator("path") - ); + await highlightAndExpectVisible( + page, + page.getByRole("cell", { name: "7", exact: true }) + ); + await page.waitForTimeout(3000); - await highlightAndExpectVisible( - page, - page.getByRole("cell", { name: "5", exact: true }) - ); + await highlightAndExpectVisible( + page, + page.getByRole("cell", { name: "8", exact: true }) + ); + await page.waitForTimeout(3000); - await highlightAndExpectVisible(page, page.getByText("6", { exact: true })); + await highlightAndExpectVisible( + page, + page.locator(".border.p-2.text-center").first() + ); + // Markiere die gesamte erste Datenzeile (Row mit "AE 1" falls vorhanden) - await highlightAndExpectVisible( - page, - page.getByRole("cell", { name: "7", exact: true }) - ); - await page.waitForTimeout(3000); + await page.waitForTimeout(3000); - await highlightAndExpectVisible( - page, - page.getByRole("cell", { name: "8", exact: true }) - ); - await page.waitForTimeout(3000); + await highlightAndExpectVisible( + page, + page + .getByRole("row", { name: "2 5.67 °C Temperatur" }) + .getByRole("button") + .first() + ); + await page.waitForTimeout(3000); - await highlightAndExpectVisible( - page, - page.locator(".border.p-2.text-center").first() - ); - // Markiere die gesamte erste Datenzeile (Row mit "AE 1" falls vorhanden) + await highlightAndExpectVisible( + page, + page.locator("tr:nth-child(3) > td:nth-child(5)") + ); + await page.waitForTimeout(3000); - await page.waitForTimeout(3000); + await highlightAndExpectVisible( + page, + page + .getByRole("row", { name: "0.01 V AE 4 Messkurve anzeigen" }) + .getByRole("button") + .first() + ); + await page.waitForTimeout(3000); - await highlightAndExpectVisible( - page, - page - .getByRole("row", { name: "2 5.67 °C Temperatur" }) - .getByRole("button") - .first() - ); - await page.waitForTimeout(3000); - - await highlightAndExpectVisible( - page, - page.locator("tr:nth-child(3) > td:nth-child(5)") - ); - await page.waitForTimeout(3000); - - await highlightAndExpectVisible( - page, - page - .getByRole("row", { name: "0.01 V AE 4 Messkurve anzeigen" }) - .getByRole("button") - .first() - ); - await page.waitForTimeout(3000); - - await highlightAndExpectVisible( - page, - page - .getByRole("row", { name: "8 -0.00 mA AE 8 Messkurve" }) - .getByLabel("Messkurve anzeigen") - ); - await page.waitForTimeout(3000); - - await page.getByRole("cell", { name: "1", exact: true }).click(); - - await page.locator(".border.p-2.text-center").first().click(); - - await highlightAndExpectVisible( - page, - page.getByRole("heading", { name: "Einstellungen Messwerteingang" }) - ); - - await highlightAndExpectVisible(page, page.getByText("Bezeichnung:")); - await highlightAndExpectVisible(page, page.getByText("Offset:")); - await highlightAndExpectVisible(page, page.getByText("Faktor:")); - await highlightAndExpectVisible(page, page.getByText("Einheit:")); - await highlightAndExpectVisible(page, page.getByText("Speicherintervall:")); - - await highlightAndExpectVisible( - page, - page.getByRole("button", { name: "Speichern" }) - ); - await page.waitForTimeout(3000); - - await highlightAndExpectVisible( - page, - page.getByRole("button", { name: "Modal schließen" }) - ); - await page.waitForTimeout(3000); - - await highlightAndExpectVisible( - page, - page.getByText( - "Einstellungen Messwerteingang 1Bezeichnung:Offset:Faktor:Einheit:" - ) - ); - await page.waitForTimeout(3000); - - await page.getByRole("button", { name: "Modal schließen" }).click(); - - await page - .getByRole("row", { name: "1 126.63 V AE 1 Messkurve" }) + await highlightAndExpectVisible( + page, + page + .getByRole("row", { name: "8 -0.00 mA AE 8 Messkurve" }) .getByLabel("Messkurve anzeigen") - .click(); + ); + await page.waitForTimeout(3000); - await highlightAndExpectVisible( - page, - page.getByText( - "Messkurve Messwerteingang 1Eingang 1VonBisAlle MesswerteDaten laden" - ) - ); + await page.getByRole("cell", { name: "1", exact: true }).click(); - await highlightAndExpectVisible( - page, - page.getByRole("heading", { name: "Messkurve Messwerteingang" }) - ); + await page.locator(".border.p-2.text-center").first().click(); - await highlightAndExpectVisible(page, page.locator("canvas")); + await highlightAndExpectVisible( + page, + page.getByRole("heading", { name: "Einstellungen Messwerteingang" }) + ); - await highlightAndExpectVisible( - page, - page.getByText("Eingang 1VonBisAlle") - ); + await highlightAndExpectVisible(page, page.getByText("Bezeichnung:")); + await highlightAndExpectVisible(page, page.getByText("Offset:")); + await highlightAndExpectVisible(page, page.getByText("Faktor:")); + await highlightAndExpectVisible(page, page.getByText("Einheit:")); + await highlightAndExpectVisible(page, page.getByText("Speicherintervall:")); - await highlightAndExpectVisible( - page, - page.getByRole("button", { name: "Daten laden" }) - ); + await highlightAndExpectVisible( + page, + page.getByRole("button", { name: "Speichern" }) + ); + await page.waitForTimeout(3000); - await highlightAndExpectVisible( - page, - page.getByRole("button", { name: "Alle Messwerte " }) - ); + await highlightAndExpectVisible( + page, + page.getByRole("button", { name: "Modal schließen" }) + ); + await page.waitForTimeout(3000); - await highlightAndExpectVisible(page, page.getByText("Von")); + await highlightAndExpectVisible( + page, + page.getByText( + "Einstellungen Messwerteingang 1Bezeichnung:Offset:Faktor:Einheit:" + ) + ); + await page.waitForTimeout(3000); - await highlightAndExpectVisible(page, page.getByText("Bis")); + await page.getByRole("button", { name: "Modal schließen" }).click(); - await highlightAndExpectVisible( - page, - page.locator("div").filter({ hasText: /^Von$/ }) - ); + await page + .getByRole("row", { name: "1 126.63 V AE 1 Messkurve" }) + .getByLabel("Messkurve anzeigen") + .click(); - await highlightAndExpectVisible( - page, - page.locator("div").filter({ hasText: /^Von$/ }).getByRole("textbox") - ); - await page.waitForTimeout(3000); + await highlightAndExpectVisible( + page, + page.getByText( + "Messkurve Messwerteingang 1Eingang 1VonBisAlle MesswerteDaten laden" + ) + ); - await highlightAndExpectVisible( - page, - page.locator("div").filter({ hasText: /^Bis$/ }) - ); - await page.waitForTimeout(3000); + await highlightAndExpectVisible( + page, + page.getByRole("heading", { name: "Messkurve Messwerteingang" }) + ); - await highlightAndExpectVisible( - page, - page.locator("div").filter({ hasText: /^Bis$/ }).getByRole("textbox") - ); - await page.waitForTimeout(3000); + await highlightAndExpectVisible(page, page.locator("canvas")); - await highlightAndExpectVisible(page, page.getByRole("img")); - await page.waitForTimeout(3000); + await highlightAndExpectVisible(page, page.getByText("Eingang 1VonBisAlle")); - await highlightAndExpectVisible( - page, - page.getByRole("button", { name: "Alle Messwerte " }) - ); - await page.getByRole("button", { name: "Alle Messwerte " }).click(); - await page.waitForTimeout(3000); + await highlightAndExpectVisible( + page, + page.getByRole("button", { name: "Daten laden" }) + ); - await page.getByRole("option", { name: "Stündlich" }).click(); - await page.waitForTimeout(3000); + await highlightAndExpectVisible( + page, + page.getByRole("button", { name: "Alle Messwerte " }) + ); - await page.getByRole("button", { name: "Stündlich" }).click(); - await page.waitForTimeout(3000); + await highlightAndExpectVisible(page, page.getByText("Von")); - await page.getByRole("option", { name: "Täglich" }).click(); - await page.waitForTimeout(3000); + await highlightAndExpectVisible(page, page.getByText("Bis")); - await page.getByRole("button", { name: "Fullscreen" }).click(); + await highlightAndExpectVisible( + page, + page.locator("div").filter({ hasText: /^Von$/ }) + ); - await page.getByRole("button", { name: "Exit fullscreen" }).click(); + await highlightAndExpectVisible( + page, + page.locator("div").filter({ hasText: /^Von$/ }).getByRole("textbox") + ); + await page.waitForTimeout(3000); - await highlightAndExpectVisible( - page, - page.getByRole("button", { name: "Fullscreen" }) - ); + await highlightAndExpectVisible( + page, + page.locator("div").filter({ hasText: /^Bis$/ }) + ); + await page.waitForTimeout(3000); - await highlightAndExpectVisible( - page, - page.getByRole("button", { name: "Modal schließen" }) - ); - await page.waitForTimeout(3000); + await highlightAndExpectVisible( + page, + page.locator("div").filter({ hasText: /^Bis$/ }).getByRole("textbox") + ); + await page.waitForTimeout(3000); - await page.getByRole("button", { name: "Modal schließen" }).click(); - }); + await highlightAndExpectVisible(page, page.getByRole("img")); + await page.waitForTimeout(3000); + await highlightAndExpectVisible( + page, + page.getByRole("button", { name: "Alle Messwerte " }) + ); + await page.getByRole("button", { name: "Alle Messwerte " }).click(); + await page.waitForTimeout(3000); + + await page.getByRole("option", { name: "Stündlich" }).click(); + await page.waitForTimeout(3000); + + await page.getByRole("button", { name: "Stündlich" }).click(); + await page.waitForTimeout(3000); + + await page.getByRole("option", { name: "Täglich" }).click(); + await page.waitForTimeout(3000); + + await page.getByRole("button", { name: "Fullscreen" }).click(); + + await page.getByRole("button", { name: "Exit fullscreen" }).click(); + + await highlightAndExpectVisible( + page, + page.getByRole("button", { name: "Fullscreen" }) + ); + + await highlightAndExpectVisible( + page, + page.getByRole("button", { name: "Modal schließen" }) + ); + await page.waitForTimeout(3000); + + await page.getByRole("button", { name: "Modal schließen" }).click(); // ...dein AnalogInputs-Testcode... } diff --git a/playwright/tests/dashboardTest.ts b/playwright/tests/dashboardTest.ts index 3c94f7e..16f494a 100644 --- a/playwright/tests/dashboardTest.ts +++ b/playwright/tests/dashboardTest.ts @@ -1,6 +1,5 @@ -import { test, expect } from "../fixtures"; import type { Locator, Page } from "@playwright/test"; -export async function runDashboardTest(page: Page) {} +import { expect } from "../fixtures"; // Kombinierte Helper-Funktion: injiziert CSS (nur einmal), hebt hervor und prüft Sichtbarkeit async function highlightAndExpectVisible( @@ -29,8 +28,8 @@ async function highlightAndExpectVisible( } await expect(locator).toBeVisible(); } -test.slow(); -test("Daschboard-Test", async ({ page }) => { + +export async function runDashboardTest(page: Page) { await page.goto("http://localhost:3000/dashboard"); await highlightAndExpectVisible( page, @@ -57,6 +56,7 @@ test("Daschboard-Test", async ({ page }) => { page, page.getByRole("cell", { name: "Zeitstempel" }) ); + // ...existing code... await highlightAndExpectVisible( page, page.getByRole("cell", { name: "Quelle" }) @@ -227,4 +227,4 @@ test("Daschboard-Test", async ({ page }) => { await highlightAndExpectVisible(page, page.getByText("KUE705FO.PDF")); await highlightAndExpectVisible(page, page.getByRole("button")); await page.getByRole("button").click(); -}); +}