From 64d5bef3e72fc3b0ef444a3b745247a01463d6d6 Mon Sep 17 00:00:00 2001 From: David Langley Date: Wed, 4 Mar 2026 15:12:28 +0000 Subject: [PATCH 1/2] Migrate playwright tests from tests/ to e2e/ convention All modules now use e2e/ for playwright tests, consistent with element-modules-private. This avoids conflicts between vitest (which uses tests/) and playwright project discovery. --- .../element-web/{tests => e2e}/banner.spec.ts | 6 +++--- .../element-web/{tests => e2e}/fixture/app1.png | Bin .../element-web/{tests => e2e}/fixture/app2.png | Bin .../element-web/{tests => e2e}/fixture/logo.svg | 0 .../{tests => e2e}/fixture/navigation.json | 0 .../{tests => e2e}/fixture/opendesk/app1.svg | 0 .../{tests => e2e}/fixture/opendesk/app10.svg | 0 .../{tests => e2e}/fixture/opendesk/app11.svg | 0 .../{tests => e2e}/fixture/opendesk/app2.svg | 0 .../{tests => e2e}/fixture/opendesk/app3.svg | 0 .../{tests => e2e}/fixture/opendesk/app4.svg | 0 .../{tests => e2e}/fixture/opendesk/app5.svg | 0 .../{tests => e2e}/fixture/opendesk/app6.svg | 0 .../{tests => e2e}/fixture/opendesk/app7.svg | 0 .../{tests => e2e}/fixture/opendesk/app8.svg | 0 .../{tests => e2e}/fixture/opendesk/app9.svg | 0 .../{tests => e2e}/fixture/opendesk/logofull.svg | 0 .../{tests => e2e}/fixture/opendesk/logomark.svg | 0 .../{tests => e2e}/fixture/silent/index.html | 0 ...ner-static-config-should-render-1-linux.aria.yml | 0 ...ner-static-config-should-render-2-linux.aria.yml | 0 ...univention-config-should-render-1-linux.aria.yml | 0 ...univention-config-should-render-2-linux.aria.yml | 0 .../snapshots/banner.spec.ts/static-menu-linux.png | Bin .../banner.spec.ts/static-nav-hover-linux.png | Bin .../snapshots/banner.spec.ts/static-nav-linux.png | Bin .../banner.spec.ts/univention-error-linux.png | Bin .../banner.spec.ts/univention-menu-linux.png | Bin .../univention-menu-loading-linux.png | Bin .../banner.spec.ts/univention-nav-hover-linux.png | Bin .../banner.spec.ts/univention-nav-linux.png | Bin .../element-web/{tests => e2e}/fixture/app1.png | Bin .../element-web/{tests => e2e}/fixture/app2.png | Bin .../element-web/{tests => e2e}/fixture/logo.svg | 0 .../{tests => e2e}/fixture/navigation.json | 0 .../{tests => e2e}/fixture/silent-login.html | 0 .../element-web/{tests => e2e}/fixture/widget.html | 0 .../element-web/{tests => e2e}/opendesk.spec.ts | 8 ++++---- .../Opendesk-should-render-top-bar-1-linux.yml | 0 .../Opendesk-should-render-top-bar-2-linux.yml | 0 .../snapshots/opendesk.spec.ts/menu-linux.png | Bin .../snapshots/opendesk.spec.ts/nav-hover-linux.png | Bin .../snapshots/opendesk.spec.ts/nav-linux.png | Bin .../opendesk.spec.ts/nav-loading-linux.png | Bin .../{tests => e2e}/restricted-guests.spec.ts | 0 .../element-web/{tests => e2e}/services.ts | 0 .../restricted-guests.spec.ts/dialog-linux.png | Bin .../restricted-guests.spec.ts/preview-bar-linux.png | Bin 48 files changed, 7 insertions(+), 7 deletions(-) rename modules/banner/element-web/{tests => e2e}/banner.spec.ts (97%) rename modules/banner/element-web/{tests => e2e}/fixture/app1.png (100%) rename modules/banner/element-web/{tests => e2e}/fixture/app2.png (100%) rename modules/banner/element-web/{tests => e2e}/fixture/logo.svg (100%) rename modules/banner/element-web/{tests => e2e}/fixture/navigation.json (100%) rename modules/banner/element-web/{tests => e2e}/fixture/opendesk/app1.svg (100%) rename modules/banner/element-web/{tests => e2e}/fixture/opendesk/app10.svg (100%) rename modules/banner/element-web/{tests => e2e}/fixture/opendesk/app11.svg (100%) rename modules/banner/element-web/{tests => e2e}/fixture/opendesk/app2.svg (100%) rename modules/banner/element-web/{tests => e2e}/fixture/opendesk/app3.svg (100%) rename modules/banner/element-web/{tests => e2e}/fixture/opendesk/app4.svg (100%) rename modules/banner/element-web/{tests => e2e}/fixture/opendesk/app5.svg (100%) rename modules/banner/element-web/{tests => e2e}/fixture/opendesk/app6.svg (100%) rename modules/banner/element-web/{tests => e2e}/fixture/opendesk/app7.svg (100%) rename modules/banner/element-web/{tests => e2e}/fixture/opendesk/app8.svg (100%) rename modules/banner/element-web/{tests => e2e}/fixture/opendesk/app9.svg (100%) rename modules/banner/element-web/{tests => e2e}/fixture/opendesk/logofull.svg (100%) rename modules/banner/element-web/{tests => e2e}/fixture/opendesk/logomark.svg (100%) rename modules/banner/element-web/{tests => e2e}/fixture/silent/index.html (100%) rename modules/banner/element-web/{tests => e2e}/snapshots/banner.spec.ts/Banner-static-config-should-render-1-linux.aria.yml (100%) rename modules/banner/element-web/{tests => e2e}/snapshots/banner.spec.ts/Banner-static-config-should-render-2-linux.aria.yml (100%) rename modules/banner/element-web/{tests => e2e}/snapshots/banner.spec.ts/Banner-univention-config-should-render-1-linux.aria.yml (100%) rename modules/banner/element-web/{tests => e2e}/snapshots/banner.spec.ts/Banner-univention-config-should-render-2-linux.aria.yml (100%) rename modules/banner/element-web/{tests => e2e}/snapshots/banner.spec.ts/static-menu-linux.png (100%) rename modules/banner/element-web/{tests => e2e}/snapshots/banner.spec.ts/static-nav-hover-linux.png (100%) rename modules/banner/element-web/{tests => e2e}/snapshots/banner.spec.ts/static-nav-linux.png (100%) rename modules/banner/element-web/{tests => e2e}/snapshots/banner.spec.ts/univention-error-linux.png (100%) rename modules/banner/element-web/{tests => e2e}/snapshots/banner.spec.ts/univention-menu-linux.png (100%) rename modules/banner/element-web/{tests => e2e}/snapshots/banner.spec.ts/univention-menu-loading-linux.png (100%) rename modules/banner/element-web/{tests => e2e}/snapshots/banner.spec.ts/univention-nav-hover-linux.png (100%) rename modules/banner/element-web/{tests => e2e}/snapshots/banner.spec.ts/univention-nav-linux.png (100%) rename modules/opendesk/element-web/{tests => e2e}/fixture/app1.png (100%) rename modules/opendesk/element-web/{tests => e2e}/fixture/app2.png (100%) rename modules/opendesk/element-web/{tests => e2e}/fixture/logo.svg (100%) rename modules/opendesk/element-web/{tests => e2e}/fixture/navigation.json (100%) rename modules/opendesk/element-web/{tests => e2e}/fixture/silent-login.html (100%) rename modules/opendesk/element-web/{tests => e2e}/fixture/widget.html (100%) rename modules/opendesk/element-web/{tests => e2e}/opendesk.spec.ts (95%) rename modules/opendesk/element-web/{tests => e2e}/snapshots/opendesk.spec.ts/Opendesk-should-render-top-bar-1-linux.yml (100%) rename modules/opendesk/element-web/{tests => e2e}/snapshots/opendesk.spec.ts/Opendesk-should-render-top-bar-2-linux.yml (100%) rename modules/opendesk/element-web/{tests => e2e}/snapshots/opendesk.spec.ts/menu-linux.png (100%) rename modules/opendesk/element-web/{tests => e2e}/snapshots/opendesk.spec.ts/nav-hover-linux.png (100%) rename modules/opendesk/element-web/{tests => e2e}/snapshots/opendesk.spec.ts/nav-linux.png (100%) rename modules/opendesk/element-web/{tests => e2e}/snapshots/opendesk.spec.ts/nav-loading-linux.png (100%) rename modules/restricted-guests/element-web/{tests => e2e}/restricted-guests.spec.ts (100%) rename modules/restricted-guests/element-web/{tests => e2e}/services.ts (100%) rename modules/restricted-guests/element-web/{tests => e2e}/snapshots/restricted-guests.spec.ts/dialog-linux.png (100%) rename modules/restricted-guests/element-web/{tests => e2e}/snapshots/restricted-guests.spec.ts/preview-bar-linux.png (100%) diff --git a/modules/banner/element-web/tests/banner.spec.ts b/modules/banner/element-web/e2e/banner.spec.ts similarity index 97% rename from modules/banner/element-web/tests/banner.spec.ts rename to modules/banner/element-web/e2e/banner.spec.ts index 2f8f3ac53f..eddc2d67e1 100644 --- a/modules/banner/element-web/tests/banner.spec.ts +++ b/modules/banner/element-web/e2e/banner.spec.ts @@ -26,7 +26,7 @@ test.describe("Banner", () => { for (const path of ["logo.svg", "app1.png", "app2.png", "opendesk/"]) { await context.route(`/${path}*`, async (route) => { const file = new URL(route.request().url()).pathname; - await route.fulfill({ path: `${moduleDir}/tests/fixture/${file}` }); + await route.fulfill({ path: `${moduleDir}/e2e/fixture/${file}` }); }); } @@ -107,13 +107,13 @@ test.describe("Banner", () => { await context.route("http://localhost:8080/ics/navigation.json*", async (route) => { await navigationJsonResolver.promise; await route.fulfill({ - path: `${moduleDir}/tests/fixture/navigation.json`, + path: `${moduleDir}/e2e/fixture/navigation.json`, contentType: "application/json", }); }); await context.route("http://localhost:8080/ics/silent", async (route) => { await route.fulfill({ - path: `${moduleDir}/tests/fixture/silent/index.html`, + path: `${moduleDir}/e2e/fixture/silent/index.html`, contentType: "text/html", }); }); diff --git a/modules/banner/element-web/tests/fixture/app1.png b/modules/banner/element-web/e2e/fixture/app1.png similarity index 100% rename from modules/banner/element-web/tests/fixture/app1.png rename to modules/banner/element-web/e2e/fixture/app1.png diff --git a/modules/banner/element-web/tests/fixture/app2.png b/modules/banner/element-web/e2e/fixture/app2.png similarity index 100% rename from modules/banner/element-web/tests/fixture/app2.png rename to modules/banner/element-web/e2e/fixture/app2.png diff --git a/modules/banner/element-web/tests/fixture/logo.svg b/modules/banner/element-web/e2e/fixture/logo.svg similarity index 100% rename from modules/banner/element-web/tests/fixture/logo.svg rename to modules/banner/element-web/e2e/fixture/logo.svg diff --git a/modules/banner/element-web/tests/fixture/navigation.json b/modules/banner/element-web/e2e/fixture/navigation.json similarity index 100% rename from modules/banner/element-web/tests/fixture/navigation.json rename to modules/banner/element-web/e2e/fixture/navigation.json diff --git a/modules/banner/element-web/tests/fixture/opendesk/app1.svg b/modules/banner/element-web/e2e/fixture/opendesk/app1.svg similarity index 100% rename from modules/banner/element-web/tests/fixture/opendesk/app1.svg rename to modules/banner/element-web/e2e/fixture/opendesk/app1.svg diff --git a/modules/banner/element-web/tests/fixture/opendesk/app10.svg b/modules/banner/element-web/e2e/fixture/opendesk/app10.svg similarity index 100% rename from modules/banner/element-web/tests/fixture/opendesk/app10.svg rename to modules/banner/element-web/e2e/fixture/opendesk/app10.svg diff --git a/modules/banner/element-web/tests/fixture/opendesk/app11.svg b/modules/banner/element-web/e2e/fixture/opendesk/app11.svg similarity index 100% rename from modules/banner/element-web/tests/fixture/opendesk/app11.svg rename to modules/banner/element-web/e2e/fixture/opendesk/app11.svg diff --git a/modules/banner/element-web/tests/fixture/opendesk/app2.svg b/modules/banner/element-web/e2e/fixture/opendesk/app2.svg similarity index 100% rename from modules/banner/element-web/tests/fixture/opendesk/app2.svg rename to modules/banner/element-web/e2e/fixture/opendesk/app2.svg diff --git a/modules/banner/element-web/tests/fixture/opendesk/app3.svg b/modules/banner/element-web/e2e/fixture/opendesk/app3.svg similarity index 100% rename from modules/banner/element-web/tests/fixture/opendesk/app3.svg rename to modules/banner/element-web/e2e/fixture/opendesk/app3.svg diff --git a/modules/banner/element-web/tests/fixture/opendesk/app4.svg b/modules/banner/element-web/e2e/fixture/opendesk/app4.svg similarity index 100% rename from modules/banner/element-web/tests/fixture/opendesk/app4.svg rename to modules/banner/element-web/e2e/fixture/opendesk/app4.svg diff --git a/modules/banner/element-web/tests/fixture/opendesk/app5.svg b/modules/banner/element-web/e2e/fixture/opendesk/app5.svg similarity index 100% rename from modules/banner/element-web/tests/fixture/opendesk/app5.svg rename to modules/banner/element-web/e2e/fixture/opendesk/app5.svg diff --git a/modules/banner/element-web/tests/fixture/opendesk/app6.svg b/modules/banner/element-web/e2e/fixture/opendesk/app6.svg similarity index 100% rename from modules/banner/element-web/tests/fixture/opendesk/app6.svg rename to modules/banner/element-web/e2e/fixture/opendesk/app6.svg diff --git a/modules/banner/element-web/tests/fixture/opendesk/app7.svg b/modules/banner/element-web/e2e/fixture/opendesk/app7.svg similarity index 100% rename from modules/banner/element-web/tests/fixture/opendesk/app7.svg rename to modules/banner/element-web/e2e/fixture/opendesk/app7.svg diff --git a/modules/banner/element-web/tests/fixture/opendesk/app8.svg b/modules/banner/element-web/e2e/fixture/opendesk/app8.svg similarity index 100% rename from modules/banner/element-web/tests/fixture/opendesk/app8.svg rename to modules/banner/element-web/e2e/fixture/opendesk/app8.svg diff --git a/modules/banner/element-web/tests/fixture/opendesk/app9.svg b/modules/banner/element-web/e2e/fixture/opendesk/app9.svg similarity index 100% rename from modules/banner/element-web/tests/fixture/opendesk/app9.svg rename to modules/banner/element-web/e2e/fixture/opendesk/app9.svg diff --git a/modules/banner/element-web/tests/fixture/opendesk/logofull.svg b/modules/banner/element-web/e2e/fixture/opendesk/logofull.svg similarity index 100% rename from modules/banner/element-web/tests/fixture/opendesk/logofull.svg rename to modules/banner/element-web/e2e/fixture/opendesk/logofull.svg diff --git a/modules/banner/element-web/tests/fixture/opendesk/logomark.svg b/modules/banner/element-web/e2e/fixture/opendesk/logomark.svg similarity index 100% rename from modules/banner/element-web/tests/fixture/opendesk/logomark.svg rename to modules/banner/element-web/e2e/fixture/opendesk/logomark.svg diff --git a/modules/banner/element-web/tests/fixture/silent/index.html b/modules/banner/element-web/e2e/fixture/silent/index.html similarity index 100% rename from modules/banner/element-web/tests/fixture/silent/index.html rename to modules/banner/element-web/e2e/fixture/silent/index.html diff --git a/modules/banner/element-web/tests/snapshots/banner.spec.ts/Banner-static-config-should-render-1-linux.aria.yml b/modules/banner/element-web/e2e/snapshots/banner.spec.ts/Banner-static-config-should-render-1-linux.aria.yml similarity index 100% rename from modules/banner/element-web/tests/snapshots/banner.spec.ts/Banner-static-config-should-render-1-linux.aria.yml rename to modules/banner/element-web/e2e/snapshots/banner.spec.ts/Banner-static-config-should-render-1-linux.aria.yml diff --git a/modules/banner/element-web/tests/snapshots/banner.spec.ts/Banner-static-config-should-render-2-linux.aria.yml b/modules/banner/element-web/e2e/snapshots/banner.spec.ts/Banner-static-config-should-render-2-linux.aria.yml similarity index 100% rename from modules/banner/element-web/tests/snapshots/banner.spec.ts/Banner-static-config-should-render-2-linux.aria.yml rename to modules/banner/element-web/e2e/snapshots/banner.spec.ts/Banner-static-config-should-render-2-linux.aria.yml diff --git a/modules/banner/element-web/tests/snapshots/banner.spec.ts/Banner-univention-config-should-render-1-linux.aria.yml b/modules/banner/element-web/e2e/snapshots/banner.spec.ts/Banner-univention-config-should-render-1-linux.aria.yml similarity index 100% rename from modules/banner/element-web/tests/snapshots/banner.spec.ts/Banner-univention-config-should-render-1-linux.aria.yml rename to modules/banner/element-web/e2e/snapshots/banner.spec.ts/Banner-univention-config-should-render-1-linux.aria.yml diff --git a/modules/banner/element-web/tests/snapshots/banner.spec.ts/Banner-univention-config-should-render-2-linux.aria.yml b/modules/banner/element-web/e2e/snapshots/banner.spec.ts/Banner-univention-config-should-render-2-linux.aria.yml similarity index 100% rename from modules/banner/element-web/tests/snapshots/banner.spec.ts/Banner-univention-config-should-render-2-linux.aria.yml rename to modules/banner/element-web/e2e/snapshots/banner.spec.ts/Banner-univention-config-should-render-2-linux.aria.yml diff --git a/modules/banner/element-web/tests/snapshots/banner.spec.ts/static-menu-linux.png b/modules/banner/element-web/e2e/snapshots/banner.spec.ts/static-menu-linux.png similarity index 100% rename from modules/banner/element-web/tests/snapshots/banner.spec.ts/static-menu-linux.png rename to modules/banner/element-web/e2e/snapshots/banner.spec.ts/static-menu-linux.png diff --git a/modules/banner/element-web/tests/snapshots/banner.spec.ts/static-nav-hover-linux.png b/modules/banner/element-web/e2e/snapshots/banner.spec.ts/static-nav-hover-linux.png similarity index 100% rename from modules/banner/element-web/tests/snapshots/banner.spec.ts/static-nav-hover-linux.png rename to modules/banner/element-web/e2e/snapshots/banner.spec.ts/static-nav-hover-linux.png diff --git a/modules/banner/element-web/tests/snapshots/banner.spec.ts/static-nav-linux.png b/modules/banner/element-web/e2e/snapshots/banner.spec.ts/static-nav-linux.png similarity index 100% rename from modules/banner/element-web/tests/snapshots/banner.spec.ts/static-nav-linux.png rename to modules/banner/element-web/e2e/snapshots/banner.spec.ts/static-nav-linux.png diff --git a/modules/banner/element-web/tests/snapshots/banner.spec.ts/univention-error-linux.png b/modules/banner/element-web/e2e/snapshots/banner.spec.ts/univention-error-linux.png similarity index 100% rename from modules/banner/element-web/tests/snapshots/banner.spec.ts/univention-error-linux.png rename to modules/banner/element-web/e2e/snapshots/banner.spec.ts/univention-error-linux.png diff --git a/modules/banner/element-web/tests/snapshots/banner.spec.ts/univention-menu-linux.png b/modules/banner/element-web/e2e/snapshots/banner.spec.ts/univention-menu-linux.png similarity index 100% rename from modules/banner/element-web/tests/snapshots/banner.spec.ts/univention-menu-linux.png rename to modules/banner/element-web/e2e/snapshots/banner.spec.ts/univention-menu-linux.png diff --git a/modules/banner/element-web/tests/snapshots/banner.spec.ts/univention-menu-loading-linux.png b/modules/banner/element-web/e2e/snapshots/banner.spec.ts/univention-menu-loading-linux.png similarity index 100% rename from modules/banner/element-web/tests/snapshots/banner.spec.ts/univention-menu-loading-linux.png rename to modules/banner/element-web/e2e/snapshots/banner.spec.ts/univention-menu-loading-linux.png diff --git a/modules/banner/element-web/tests/snapshots/banner.spec.ts/univention-nav-hover-linux.png b/modules/banner/element-web/e2e/snapshots/banner.spec.ts/univention-nav-hover-linux.png similarity index 100% rename from modules/banner/element-web/tests/snapshots/banner.spec.ts/univention-nav-hover-linux.png rename to modules/banner/element-web/e2e/snapshots/banner.spec.ts/univention-nav-hover-linux.png diff --git a/modules/banner/element-web/tests/snapshots/banner.spec.ts/univention-nav-linux.png b/modules/banner/element-web/e2e/snapshots/banner.spec.ts/univention-nav-linux.png similarity index 100% rename from modules/banner/element-web/tests/snapshots/banner.spec.ts/univention-nav-linux.png rename to modules/banner/element-web/e2e/snapshots/banner.spec.ts/univention-nav-linux.png diff --git a/modules/opendesk/element-web/tests/fixture/app1.png b/modules/opendesk/element-web/e2e/fixture/app1.png similarity index 100% rename from modules/opendesk/element-web/tests/fixture/app1.png rename to modules/opendesk/element-web/e2e/fixture/app1.png diff --git a/modules/opendesk/element-web/tests/fixture/app2.png b/modules/opendesk/element-web/e2e/fixture/app2.png similarity index 100% rename from modules/opendesk/element-web/tests/fixture/app2.png rename to modules/opendesk/element-web/e2e/fixture/app2.png diff --git a/modules/opendesk/element-web/tests/fixture/logo.svg b/modules/opendesk/element-web/e2e/fixture/logo.svg similarity index 100% rename from modules/opendesk/element-web/tests/fixture/logo.svg rename to modules/opendesk/element-web/e2e/fixture/logo.svg diff --git a/modules/opendesk/element-web/tests/fixture/navigation.json b/modules/opendesk/element-web/e2e/fixture/navigation.json similarity index 100% rename from modules/opendesk/element-web/tests/fixture/navigation.json rename to modules/opendesk/element-web/e2e/fixture/navigation.json diff --git a/modules/opendesk/element-web/tests/fixture/silent-login.html b/modules/opendesk/element-web/e2e/fixture/silent-login.html similarity index 100% rename from modules/opendesk/element-web/tests/fixture/silent-login.html rename to modules/opendesk/element-web/e2e/fixture/silent-login.html diff --git a/modules/opendesk/element-web/tests/fixture/widget.html b/modules/opendesk/element-web/e2e/fixture/widget.html similarity index 100% rename from modules/opendesk/element-web/tests/fixture/widget.html rename to modules/opendesk/element-web/e2e/fixture/widget.html diff --git a/modules/opendesk/element-web/tests/opendesk.spec.ts b/modules/opendesk/element-web/e2e/opendesk.spec.ts similarity index 95% rename from modules/opendesk/element-web/tests/opendesk.spec.ts rename to modules/opendesk/element-web/e2e/opendesk.spec.ts index 7df5502fc7..46d4506b32 100644 --- a/modules/opendesk/element-web/tests/opendesk.spec.ts +++ b/modules/opendesk/element-web/e2e/opendesk.spec.ts @@ -51,20 +51,20 @@ test.use({ page: async ({ context, page, moduleDir }, use) => { for (const path of ["logo.svg", "app1.png", "app2.png"]) { await context.route(`/${path}*`, async (route) => { - await route.fulfill({ path: `${moduleDir}/tests/fixture/${path}` }); + await route.fulfill({ path: `${moduleDir}/e2e/fixture/${path}` }); }); } await context.route("http://localhost:8080/ics/navigation.json*", async (route) => { await route.fulfill({ - path: `${moduleDir}/tests/fixture/navigation.json`, + path: `${moduleDir}/e2e/fixture/navigation.json`, contentType: "application/json", }); }); await context.route("http://localhost:8080/ics/silent", async (route) => { - await route.fulfill({ path: `${moduleDir}/tests/fixture/silent-login.html`, contentType: "text/html" }); + await route.fulfill({ path: `${moduleDir}/e2e/fixture/silent-login.html`, contentType: "text/html" }); }); await context.route("http://localhost:8080/widget.html*", async (route) => { - await route.fulfill({ path: `${moduleDir}/tests/fixture/widget.html`, contentType: "text/html" }); + await route.fulfill({ path: `${moduleDir}/e2e/fixture/widget.html`, contentType: "text/html" }); }); await page.goto("/"); diff --git a/modules/opendesk/element-web/tests/snapshots/opendesk.spec.ts/Opendesk-should-render-top-bar-1-linux.yml b/modules/opendesk/element-web/e2e/snapshots/opendesk.spec.ts/Opendesk-should-render-top-bar-1-linux.yml similarity index 100% rename from modules/opendesk/element-web/tests/snapshots/opendesk.spec.ts/Opendesk-should-render-top-bar-1-linux.yml rename to modules/opendesk/element-web/e2e/snapshots/opendesk.spec.ts/Opendesk-should-render-top-bar-1-linux.yml diff --git a/modules/opendesk/element-web/tests/snapshots/opendesk.spec.ts/Opendesk-should-render-top-bar-2-linux.yml b/modules/opendesk/element-web/e2e/snapshots/opendesk.spec.ts/Opendesk-should-render-top-bar-2-linux.yml similarity index 100% rename from modules/opendesk/element-web/tests/snapshots/opendesk.spec.ts/Opendesk-should-render-top-bar-2-linux.yml rename to modules/opendesk/element-web/e2e/snapshots/opendesk.spec.ts/Opendesk-should-render-top-bar-2-linux.yml diff --git a/modules/opendesk/element-web/tests/snapshots/opendesk.spec.ts/menu-linux.png b/modules/opendesk/element-web/e2e/snapshots/opendesk.spec.ts/menu-linux.png similarity index 100% rename from modules/opendesk/element-web/tests/snapshots/opendesk.spec.ts/menu-linux.png rename to modules/opendesk/element-web/e2e/snapshots/opendesk.spec.ts/menu-linux.png diff --git a/modules/opendesk/element-web/tests/snapshots/opendesk.spec.ts/nav-hover-linux.png b/modules/opendesk/element-web/e2e/snapshots/opendesk.spec.ts/nav-hover-linux.png similarity index 100% rename from modules/opendesk/element-web/tests/snapshots/opendesk.spec.ts/nav-hover-linux.png rename to modules/opendesk/element-web/e2e/snapshots/opendesk.spec.ts/nav-hover-linux.png diff --git a/modules/opendesk/element-web/tests/snapshots/opendesk.spec.ts/nav-linux.png b/modules/opendesk/element-web/e2e/snapshots/opendesk.spec.ts/nav-linux.png similarity index 100% rename from modules/opendesk/element-web/tests/snapshots/opendesk.spec.ts/nav-linux.png rename to modules/opendesk/element-web/e2e/snapshots/opendesk.spec.ts/nav-linux.png diff --git a/modules/opendesk/element-web/tests/snapshots/opendesk.spec.ts/nav-loading-linux.png b/modules/opendesk/element-web/e2e/snapshots/opendesk.spec.ts/nav-loading-linux.png similarity index 100% rename from modules/opendesk/element-web/tests/snapshots/opendesk.spec.ts/nav-loading-linux.png rename to modules/opendesk/element-web/e2e/snapshots/opendesk.spec.ts/nav-loading-linux.png diff --git a/modules/restricted-guests/element-web/tests/restricted-guests.spec.ts b/modules/restricted-guests/element-web/e2e/restricted-guests.spec.ts similarity index 100% rename from modules/restricted-guests/element-web/tests/restricted-guests.spec.ts rename to modules/restricted-guests/element-web/e2e/restricted-guests.spec.ts diff --git a/modules/restricted-guests/element-web/tests/services.ts b/modules/restricted-guests/element-web/e2e/services.ts similarity index 100% rename from modules/restricted-guests/element-web/tests/services.ts rename to modules/restricted-guests/element-web/e2e/services.ts diff --git a/modules/restricted-guests/element-web/tests/snapshots/restricted-guests.spec.ts/dialog-linux.png b/modules/restricted-guests/element-web/e2e/snapshots/restricted-guests.spec.ts/dialog-linux.png similarity index 100% rename from modules/restricted-guests/element-web/tests/snapshots/restricted-guests.spec.ts/dialog-linux.png rename to modules/restricted-guests/element-web/e2e/snapshots/restricted-guests.spec.ts/dialog-linux.png diff --git a/modules/restricted-guests/element-web/tests/snapshots/restricted-guests.spec.ts/preview-bar-linux.png b/modules/restricted-guests/element-web/e2e/snapshots/restricted-guests.spec.ts/preview-bar-linux.png similarity index 100% rename from modules/restricted-guests/element-web/tests/snapshots/restricted-guests.spec.ts/preview-bar-linux.png rename to modules/restricted-guests/element-web/e2e/snapshots/restricted-guests.spec.ts/preview-bar-linux.png From 055a127841dfa9aff9d4adb6df302cddbd827551 Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 16 Mar 2026 17:58:23 +0000 Subject: [PATCH 2/2] Pin react deps to exact version in package.json Yarn had somehow confused itself and got into a state where it refused to install react 19.2.4, so much so that even renovate thought it had upgraded the package (https://github.com/element-hq/element-modules/pull/208) when it hadn't. Until we switch to pnom and can use catalog:, pin them to exact version which seems to make yarn play ball again. --- modules/banner/element-web/package.json | 2 +- modules/opendesk/element-web/package.json | 4 ++-- modules/restricted-guests/element-web/package.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/banner/element-web/package.json b/modules/banner/element-web/package.json index c78181b379..df45f81985 100644 --- a/modules/banner/element-web/package.json +++ b/modules/banner/element-web/package.json @@ -17,7 +17,7 @@ "@types/node": "^22.10.7", "@types/react": "^19", "@vitejs/plugin-react": "^5.0.0", - "react": "^19", + "react": "19.2.4", "rollup-plugin-external-globals": "^0.13.0", "typescript": "^5.7.3", "vite": "^7.1.11", diff --git a/modules/opendesk/element-web/package.json b/modules/opendesk/element-web/package.json index 653df09fa7..c0fa58b261 100644 --- a/modules/opendesk/element-web/package.json +++ b/modules/opendesk/element-web/package.json @@ -22,8 +22,8 @@ "@types/node": "^22.10.7", "@types/react": "^19", "@vitejs/plugin-react": "^5.0.0", - "react": "^19", - "react-dom": "^19", + "react": "19.2.4", + "react-dom": "19.2.4", "rollup-plugin-external-globals": "^0.13.0", "typescript": "^5.7.3", "vite": "^7.1.11", diff --git a/modules/restricted-guests/element-web/package.json b/modules/restricted-guests/element-web/package.json index 8587318f64..dfe5c0f0f3 100644 --- a/modules/restricted-guests/element-web/package.json +++ b/modules/restricted-guests/element-web/package.json @@ -17,7 +17,7 @@ "@types/node": "^22.10.7", "@types/react": "^19", "@vitejs/plugin-react": "^5.0.0", - "react": "^19", + "react": "19.2.4", "rollup-plugin-external-globals": "^0.13.0", "typescript": "^5.7.3", "vite": "^7.1.11",