diff --git a/modules/banner/element-web/src/Menu.tsx b/modules/banner/element-web/src/Menu.tsx index df6771a56d..7b32d53c56 100644 --- a/modules/banner/element-web/src/Menu.tsx +++ b/modules/banner/element-web/src/Menu.tsx @@ -155,6 +155,7 @@ const Menu: FC = ({ api, config, fallbackLogoUrl }) => { const [open, setOpen] = useState(false); let content: JSX.Element; + let logoUrl = fallbackLogoUrl; if (config instanceof Error) { content = {api.i18n.translate("univention_error")}; } else if (config) { @@ -165,6 +166,9 @@ const Menu: FC = ({ api, config, fallbackLogoUrl }) => { ))} ); + if (config.logo_url) { + logoUrl = config.logo_url; + } } else { content = ( @@ -205,7 +209,7 @@ const Menu: FC = ({ api, config, fallbackLogoUrl }) => { > - + ; +}>({ + navigationJsonResolver: async ({}, use) => { + await use(Promise.withResolvers()); + }, +}); + test.describe("Banner", () => { test.use({ displayName: "Timmy", - navigationJsonResolver: async ({}, use) => { - await use(Promise.withResolvers()); - }, page: async ({ context, page, moduleDir }, use) => { for (const path of ["logo.svg", "app1.png", "app2.png", "opendesk/"]) { await context.route(`/${path}*`, async (route) => { @@ -190,14 +196,13 @@ test.describe("Banner", () => { await expect(page.getByRole("heading", { name: "Welcome to Element!" })).toBeVisible(); await expect(page.getByLabel("Show portal")).toHaveAttribute("href", "https://example.com/portal"); - const nav = page.locator("nav"); - const trigger = page.getByLabel("Show menu"); await trigger.click(); const sidebar = page.getByRole("dialog"); await expect(sidebar.getByText("Failed to load")).toBeVisible(); await expect(sidebar).toMatchScreenshot("univention_error.png"); + await expect(axe).toHaveNoViolations(); }); }); }); diff --git a/modules/banner/element-web/tests/snapshots/banner.spec.ts/static-menu-linux.png b/modules/banner/element-web/tests/snapshots/banner.spec.ts/static-menu-linux.png new file mode 100644 index 0000000000..ae2531c66b Binary files /dev/null and b/modules/banner/element-web/tests/snapshots/banner.spec.ts/static-menu-linux.png differ diff --git a/modules/banner/element-web/tests/snapshots/banner.spec.ts/static-nav-hover-linux.png b/modules/banner/element-web/tests/snapshots/banner.spec.ts/static-nav-hover-linux.png new file mode 100644 index 0000000000..70092afd6a Binary files /dev/null and b/modules/banner/element-web/tests/snapshots/banner.spec.ts/static-nav-hover-linux.png differ diff --git a/modules/banner/element-web/tests/snapshots/banner.spec.ts/static-nav-linux.png b/modules/banner/element-web/tests/snapshots/banner.spec.ts/static-nav-linux.png new file mode 100644 index 0000000000..dfa9b9b255 Binary files /dev/null and b/modules/banner/element-web/tests/snapshots/banner.spec.ts/static-nav-linux.png differ diff --git a/modules/banner/element-web/tests/snapshots/banner.spec.ts/univention-error-linux.png b/modules/banner/element-web/tests/snapshots/banner.spec.ts/univention-error-linux.png new file mode 100644 index 0000000000..14f92293ba Binary files /dev/null and b/modules/banner/element-web/tests/snapshots/banner.spec.ts/univention-error-linux.png differ diff --git a/modules/banner/element-web/tests/snapshots/banner.spec.ts/univention-menu-linux.png b/modules/banner/element-web/tests/snapshots/banner.spec.ts/univention-menu-linux.png new file mode 100644 index 0000000000..4ef975f344 Binary files /dev/null and b/modules/banner/element-web/tests/snapshots/banner.spec.ts/univention-menu-linux.png differ diff --git a/modules/banner/element-web/tests/snapshots/banner.spec.ts/univention-menu-loading-linux.png b/modules/banner/element-web/tests/snapshots/banner.spec.ts/univention-menu-loading-linux.png new file mode 100644 index 0000000000..32a60c7b42 Binary files /dev/null and b/modules/banner/element-web/tests/snapshots/banner.spec.ts/univention-menu-loading-linux.png differ diff --git a/modules/banner/element-web/tests/snapshots/banner.spec.ts/univention-nav-hover-linux.png b/modules/banner/element-web/tests/snapshots/banner.spec.ts/univention-nav-hover-linux.png new file mode 100644 index 0000000000..d2a11f1949 Binary files /dev/null and b/modules/banner/element-web/tests/snapshots/banner.spec.ts/univention-nav-hover-linux.png differ diff --git a/modules/banner/element-web/tests/snapshots/banner.spec.ts/univention-nav-linux.png b/modules/banner/element-web/tests/snapshots/banner.spec.ts/univention-nav-linux.png new file mode 100644 index 0000000000..6587c1b481 Binary files /dev/null and b/modules/banner/element-web/tests/snapshots/banner.spec.ts/univention-nav-linux.png differ