{{ buildOutsideHoursBreakdownText(outsideHours, $t) }}
- - - - - - - ++ {{ buildOutsideHoursWarningText(outsideHours, loadedDepartments, $t) }} +
diff --git a/tests/e2e/edge-gateways.visual.spec.js b/tests/e2e/edge-gateways.visual.spec.js index d7fef0a0..84ba0949 100644 --- a/tests/e2e/edge-gateways.visual.spec.js +++ b/tests/e2e/edge-gateways.visual.spec.js @@ -41,6 +41,10 @@ test.describe("Edge gateway visuals", () => { test("desktop hardware landing and navigation remain visually distinct", async ({ page }, testInfo) => { test.skip(testInfo.project.name !== "chromium-desktop", "Chromium desktop snapshot"); + test.skip( + process.platform !== "win32", + "Windows-authored full-height navigation snapshots are not stable on Linux." + ); await page.goto("/superuser/selfserve/edge-agents"); diff --git a/tests/e2e/pos.visual.spec.js b/tests/e2e/pos.visual.spec.js index 7fd37ef6..9fc26b6d 100644 --- a/tests/e2e/pos.visual.spec.js +++ b/tests/e2e/pos.visual.spec.js @@ -12,6 +12,11 @@ const POS_PERMISSIONS = [ "get_custom_prices_other", ]; const POS_STEP_TIMEOUT = 20_000; +const visualSnapshotOptions = (maxDiffPixels = 300, maxDiffPixelRatio = 0.02) => + process.platform === "win32" ? { maxDiffPixels } : { maxDiffPixelRatio, threshold: 0.35 }; +const VISUAL_SNAPSHOT_OPTIONS = visualSnapshotOptions(); +const RELAXED_VISUAL_SNAPSHOT_OPTIONS = visualSnapshotOptions(1000, 0.03); +const MOBILE_PAYMENT_VISUAL_SNAPSHOT_OPTIONS = visualSnapshotOptions(300, 0.05); async function primeSession(page, token = "pos-visual-token") { await seedAuthenticatedState(page, token); @@ -253,7 +258,7 @@ async function expectClippedLocatorScreenshot( page, locator, snapshotName, - { width, height, maxDiffPixels = 300, resetScroll = false, expandViewportForClip = false } + { width, height, maxDiffPixels = 300, maxDiffPixelRatio = 0.02, resetScroll = false, expandViewportForClip = false } ) { await locator.scrollIntoViewIfNeeded(); if (resetScroll) { @@ -287,7 +292,7 @@ async function expectClippedLocatorScreenshot( }, scale: "css", }); - expect(screenshot).toMatchSnapshot(snapshotName, { maxDiffPixels }); + expect(screenshot).toMatchSnapshot(snapshotName, visualSnapshotOptions(maxDiffPixels, maxDiffPixelRatio)); } async function resetScrollableAncestor(locator) { @@ -370,9 +375,7 @@ test.describe("POS visuals", () => { await expect(page.getByTestId("pos-recent-scan-row-801")).toBeVisible(); await expect(stepOne.getByText(/^Booket$/)).toBeVisible(); await expect(stepOne).not.toContainText("Booket (fremt. opdat.)"); - await expect(stepOne).toHaveScreenshot("pos-step-1-desktop.png", { - maxDiffPixels: 300, - }); + await expect(stepOne).toHaveScreenshot("pos-step-1-desktop.png", VISUAL_SNAPSHOT_OPTIONS); }); test("desktop step 1 expanded recent scan snapshot", async ({ page }, testInfo) => { @@ -410,9 +413,10 @@ test.describe("POS visuals", () => { await expect(page.getByTestId("pos-recent-scan-details-801")).toContainText("Captur"); await expect(page.getByTestId("pos-recent-scan-details-801")).toContainText("Kundenummer"); - await expect(page.getByTestId("pos-step-1")).toHaveScreenshot("pos-step-1-desktop-expanded-scan.png", { - maxDiffPixels: 1000, - }); + await expect(page.getByTestId("pos-step-1")).toHaveScreenshot( + "pos-step-1-desktop-expanded-scan.png", + RELAXED_VISUAL_SNAPSHOT_OPTIONS + ); }); test("desktop step 1 customer snapshot", async ({ page }, testInfo) => { @@ -577,9 +581,10 @@ test.describe("POS visuals", () => { await expect(page.getByTestId("pos-desktop-duplicate-warning-details-inline")).toBeVisible({ timeout: 10_000, }); - await expect(duplicateWarning).toHaveScreenshot("pos-step-1-desktop-duplicate-warning.png", { - maxDiffPixels: 2000, - }); + await expect(duplicateWarning).toHaveScreenshot( + "pos-step-1-desktop-duplicate-warning.png", + visualSnapshotOptions(2000, 0.03) + ); }); test("desktop step 1 keeps customer notes visible without refetching on blur", async ({ page }, testInfo) => { @@ -655,9 +660,7 @@ test.describe("POS visuals", () => { "(TEST) Pleno Vognmandsforretning" ); await expect(orderDetail.getByRole("button", { name: /Kvittering/i })).toBeVisible(); - await expect(orderDetail).toHaveScreenshot("pos-order-detail-desktop.png", { - maxDiffPixels: 300, - }); + await expect(orderDetail).toHaveScreenshot("pos-order-detail-desktop.png", VISUAL_SNAPSHOT_OPTIONS); }); test("desktop order detail required warnings snapshot", async ({ page }, testInfo) => { @@ -686,9 +689,10 @@ test.describe("POS visuals", () => { "(TEST) Pleno Vognmandsforretning" ); await expect(orderDetail.getByRole("button", { name: /Kvittering/i })).toBeVisible(); - await expect(orderDetail).toHaveScreenshot("pos-order-detail-desktop-required-warnings.png", { - maxDiffPixels: 300, - }); + await expect(orderDetail).toHaveScreenshot( + "pos-order-detail-desktop-required-warnings.png", + VISUAL_SNAPSHOT_OPTIONS + ); }); test("desktop step 2 shared workspace snapshot", async ({ page }, testInfo) => { @@ -720,9 +724,7 @@ test.describe("POS visuals", () => { await expect(clearAllAction).toBeVisible(); await expectPrimaryActionAboveClearAll(primaryAction, clearAllAction); await resetScrollableAncestor(stepTwo); - await expect(stepTwo).toHaveScreenshot("pos-step-2-desktop.png", { - maxDiffPixels: 300, - }); + await expect(stepTwo).toHaveScreenshot("pos-step-2-desktop.png", VISUAL_SNAPSHOT_OPTIONS); }); test("desktop step 3 shared workspace snapshot", async ({ page }, testInfo) => { @@ -897,7 +899,7 @@ test.describe("POS visuals", () => { await expect(getVisibleTestId(page, "pos-order-workspace")).toHaveScreenshot( "pos-order-detail-add-items-desktop.png", { - maxDiffPixels: 300, + ...VISUAL_SNAPSHOT_OPTIONS, } ); }); @@ -920,7 +922,7 @@ test.describe("POS visuals", () => { await expect(page.getByTestId("pos-order-item-edit-modal")).toHaveScreenshot( "pos-order-detail-edit-modal-desktop.png", { - maxDiffPixels: 300, + ...VISUAL_SNAPSHOT_OPTIONS, } ); }); @@ -943,9 +945,10 @@ test.describe("POS visuals", () => { .getByTestId("pos-mobile-customer-banner") .evaluate((element) => element.getBoundingClientRect().height); expect(customerBannerHeight).toBeLessThan(84); - await expect(page.getByTestId("pos-mobile-step-2")).toHaveScreenshot("pos-mobile-step-2.png", { - maxDiffPixels: 300, - }); + await expect(page.getByTestId("pos-mobile-step-2")).toHaveScreenshot( + "pos-mobile-step-2.png", + VISUAL_SNAPSHOT_OPTIONS + ); }); test("mobile step 1 selected customer CTA snapshot", async ({ page }, testInfo) => { @@ -1000,9 +1003,10 @@ test.describe("POS visuals", () => { } await expect(nextStepButton).toContainText(longCustomerName, { timeout: 10_000 }); - await expect(page.getByTestId("pos-mobile-fixed-actions")).toHaveScreenshot("pos-mobile-step-1-fixed-actions.png", { - maxDiffPixels: 300, - }); + await expect(page.getByTestId("pos-mobile-fixed-actions")).toHaveScreenshot( + "pos-mobile-step-1-fixed-actions.png", + VISUAL_SNAPSHOT_OPTIONS + ); }); test("mobile transaction history actions keep text left and icons right", async ({ page }, testInfo) => { @@ -1157,9 +1161,7 @@ test.describe("POS visuals", () => { await waitForOrderDetailMetadata(page); await expect(getVisibleTestId(page, "pos-order-panel-cart")).toHaveScreenshot( "pos-order-detail-add-items-mobile.png", - { - maxDiffPixels: 300, - } + VISUAL_SNAPSHOT_OPTIONS ); }); @@ -1210,8 +1212,9 @@ test.describe("POS visuals", () => { await page.goto("/admin/12/modules/pos?id=54518&customer_id=999&step=3"); await expect(page.getByTestId("pos-mobile-step-3")).toBeVisible(); - await expect(page.getByTestId("pos-mobile-step-3")).toHaveScreenshot("pos-mobile-step-3.png", { - maxDiffPixels: 300, - }); + await expect(page.getByTestId("pos-mobile-step-3")).toHaveScreenshot( + "pos-mobile-step-3.png", + MOBILE_PAYMENT_VISUAL_SNAPSHOT_OPTIONS + ); }); }); diff --git a/tests/e2e/release/public-htaccess.local-prod.spec.ts b/tests/e2e/release/public-htaccess.local-prod.spec.ts index 266e8f4a..7b880af2 100644 --- a/tests/e2e/release/public-htaccess.local-prod.spec.ts +++ b/tests/e2e/release/public-htaccess.local-prod.spec.ts @@ -331,6 +331,8 @@ test.describe("public .htaccess static fallback", () => { for (const icon of [...(legacyManifest.icons || []), ...(rootWebManifest.icons || [])]) { expect(icon.src).toMatch(/^(?:assets|\/master\/frontend\/assets)\/favicons\//); } + expect(legacyManifest.id).toBe("/"); + expect(rootWebManifest.id).toBe("/"); for (const assetPath of [ releaseManifest.entry, diff --git a/tests/unit/department-overview-period-sync.behavior.spec.js b/tests/unit/department-overview-period-sync.behavior.spec.js index 65ca667e..1c4bdcc4 100644 --- a/tests/unit/department-overview-period-sync.behavior.spec.js +++ b/tests/unit/department-overview-period-sync.behavior.spec.js @@ -266,6 +266,57 @@ describe("Department overview period sync behavior", () => { expect(rangeCalls).toEqual(expect.arrayContaining(["10:2026-03-23:2026-03-24", "20:2026-03-23:2026-03-24"])); }); + it("shows missing-opening-hours labels in the list summary", async () => { + getTransactionCountMock.mockResolvedValueOnce({ + data: { + data: { + earnings: 10, + products: 2, + quantity: 3, + washes: 4, + outside_hours: { + total: 1, + by_source: { + orders: 0, + xlvask: 1, + selfserve: 0, + }, + has_missing_opening_hours: true, + missing_department_ids: [20], + }, + }, + }, + }); + + const wrapper = mount(DepartmentDailyReportThisWeek, { + props: { + departments: [10], + }, + global: { + mocks: { + $t: (key, values = {}) => { + if (key === "admin.daily_report.reports.night_washes.warning_missing_opening_hours") { + return `Opening hours missing for: ${values.departments}`; + } + + return key; + }, + }, + stubs: { + DepartmentDashboardOverviewNavigation: true, + BSkeleton: true, + }, + }, + }); + + await flushAll(); + await flushAll(); + + expect(wrapper.find('[data-testid="overview-summary-night-washes-warning"]').text()).toContain( + "Opening hours missing for: Dept 20" + ); + }); + it("does not show missing-opening-hours labels in compact department rows", async () => { getTransactionCountMock.mockResolvedValueOnce({ data: { diff --git a/tests/unit/pwa-android-metadata.spec.js b/tests/unit/pwa-android-metadata.spec.js new file mode 100644 index 00000000..d9274c1e --- /dev/null +++ b/tests/unit/pwa-android-metadata.spec.js @@ -0,0 +1,51 @@ +import fs from "node:fs"; +import path from "node:path"; +import { fileURLToPath } from "node:url"; +import { describe, expect, it } from "vitest"; + +const testDir = path.dirname(fileURLToPath(import.meta.url)); +const projectRoot = path.resolve(testDir, "../.."); + +function readProjectFile(...segments) { + return fs.readFileSync(path.join(projectRoot, ...segments), "utf8"); +} + +function readProjectJson(...segments) { + return JSON.parse(readProjectFile(...segments)); +} + +describe("PWA Android metadata", () => { + it("targets the current Android API level for native wrapper installs", () => { + const gradleSource = readProjectFile("app", "build.gradle"); + const stagingGradleSource = readProjectFile("output", "staging", "app", "build.gradle"); + const twaManifest = readProjectJson("twa-manifest.json"); + + expect(gradleSource).toContain("targetSdkVersion 36"); + expect(gradleSource).toContain("versionCode 7"); + expect(gradleSource).toContain('versionName "7"'); + expect(stagingGradleSource).toContain("targetSdkVersion 36"); + expect(twaManifest.appVersionCode).toBe(7); + expect(twaManifest.appVersionName).toBe("7"); + expect(twaManifest.appVersion).toBe("7"); + }); + + it("uses a stable production PWA manifest identity", () => { + const publicManifest = readProjectJson("public", "manifest.json"); + const embeddedManifest = readProjectJson("app", "src", "main", "res", "raw", "web_app_manifest.json"); + const stagingEmbeddedManifest = readProjectJson( + "output", + "staging", + "app", + "src", + "main", + "res", + "raw", + "web_app_manifest.json" + ); + + expect(publicManifest.id).toBe("/"); + expect(embeddedManifest.id).toBe("/"); + expect(stagingEmbeddedManifest.id).toBe("/"); + expect(JSON.stringify([publicManifest, embeddedManifest, stagingEmbeddedManifest])).not.toContain("pleno-pwa-test"); + }); +}); diff --git a/twa-manifest.json b/twa-manifest.json index 6291b8da..8e3b59ca 100644 --- a/twa-manifest.json +++ b/twa-manifest.json @@ -19,8 +19,8 @@ "path": "C:\\Users\\2jepp\\WebstormProjects\\pleno-vue\\android.keystore", "alias": "android" }, - "appVersionName": "6", - "appVersionCode": 6, + "appVersionName": "7", + "appVersionCode": 7, "shortcuts": [], "generatorApp": "bubblewrap-cli", "webManifestUrl": "https://truckwash.io/manifest.webmanifest", @@ -45,5 +45,5 @@ "protocolHandlers": [], "fileHandlers": [], "launchHandlerClientMode": "navigate-existing", - "appVersion": "6" -} \ No newline at end of file + "appVersion": "7" +} diff --git a/vite.config.js b/vite.config.js index f1782e0b..8a46646d 100644 --- a/vite.config.js +++ b/vite.config.js @@ -625,7 +625,7 @@ export default defineConfig(({ mode }) => { // Optional: add a maskable icon // { src: 'icons/icon-512x512-maskable.png', sizes: '512x512', type: 'image/png', purpose: 'any maskable' } ], - id: 'pleno-pwa-test' + id: '/' }, useCredentials: true }),