Merge branch 'develop' into dbkr/stateafter

test/unit-tests/components/views/auth/AuthFooter-test.tsx

@@ -9,16 +9,16 @@ Please see LICENSE files in the repository root for full details.
 import * as React from "react";
 import { render } from "jest-matrix-react";
 
-import VectorAuthPage from "../../../../../src/components/views/auth/VectorAuthPage";
+import AuthFooter from "../../../../../src/components/views/auth/AuthFooter";
 import { setupLanguageMock } from "../../../../setup/setupLanguage";
 
-describe("<VectorAuthPage />", () => {
+describe("<AuthFooter />", () => {
     beforeEach(() => {
         setupLanguageMock();
     });
 
     it("should match snapshot", () => {
-        const { asFragment } = render(<VectorAuthPage />);
+        const { asFragment } = render(<AuthFooter />);
         expect(asFragment()).toMatchSnapshot();
     });
 });

test/unit-tests/components/views/auth/AuthHeaderLogo-test.tsx

@@ -9,11 +9,11 @@ Please see LICENSE files in the repository root for full details.
 import * as React from "react";
 import { render } from "jest-matrix-react";
 
-import VectorAuthHeaderLogo from "../../../../../src/components/views/auth/VectorAuthHeaderLogo";
+import AuthHeaderLogo from "../../../../../src/components/views/auth/AuthHeaderLogo";
 
-describe("<VectorAuthHeaderLogo />", () => {
+describe("<AuthHeaderLogo />", () => {
     it("should match snapshot", () => {
-        const { asFragment } = render(<VectorAuthHeaderLogo />);
+        const { asFragment } = render(<AuthHeaderLogo />);
         expect(asFragment()).toMatchSnapshot();
     });
 });

test/unit-tests/components/views/auth/AuthPage-test.tsx

@@ -0,0 +1,36 @@
+/*
+Copyright 2024 New Vector Ltd.
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only
+Please see LICENSE files in the repository root for full details.
+*/
+
+import * as React from "react";
+import { render } from "jest-matrix-react";
+
+import AuthPage from "../../../../../src/components/views/auth/AuthPage";
+import { setupLanguageMock } from "../../../../setup/setupLanguage";
+import SdkConfig from "../../../../../src/SdkConfig.ts";
+
+describe("<AuthPage />", () => {
+    beforeEach(() => {
+        setupLanguageMock();
+        SdkConfig.reset();
+        // @ts-ignore private access
+        AuthPage.welcomeBackgroundUrl = undefined;
+    });
+
+    it("should match snapshot", () => {
+        const { asFragment } = render(<AuthPage />);
+        expect(asFragment()).toMatchSnapshot();
+    });
+
+    it("should use configured background url", () => {
+        SdkConfig.add({ branding: { welcome_background_url: ["https://example.com/image.png"] } });
+        const { container } = render(<AuthPage />);
+        expect(container.querySelector(".mx_AuthPage")).toHaveStyle({
+            background: "center/cover fixed url(https://example.com/image.png)",
+        });
+    });
+});

test/unit-tests/components/views/auth/VectorAuthFooter-test.tsx

@@ -1,24 +0,0 @@
-/*
-Copyright 2024 New Vector Ltd.
-Copyright 2022 The Matrix.org Foundation C.I.C.
-
-SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only
-Please see LICENSE files in the repository root for full details.
-*/
-
-import * as React from "react";
-import { render } from "jest-matrix-react";
-
-import VectorAuthFooter from "../../../../../src/components/views/auth/VectorAuthFooter";
-import { setupLanguageMock } from "../../../../setup/setupLanguage";
-
-describe("<VectorAuthFooter />", () => {
-    beforeEach(() => {
-        setupLanguageMock();
-    });
-
-    it("should match snapshot", () => {
-        const { asFragment } = render(<VectorAuthFooter />);
-        expect(asFragment()).toMatchSnapshot();
-    });
-});

test/unit-tests/components/views/auth/__snapshots__/AuthFooter-test.tsx.snap

@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`<VectorAuthFooter /> should match snapshot 1`] = `
+exports[`<AuthFooter /> should match snapshot 1`] = `
 <DocumentFragment>
   <footer
     class="mx_AuthFooter"

test/unit-tests/components/views/auth/__snapshots__/AuthHeaderLogo-test.tsx.snap

@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`<VectorAuthHeaderLogo /> should match snapshot 1`] = `
+exports[`<AuthHeaderLogo /> should match snapshot 1`] = `
 <DocumentFragment>
   <aside
     class="mx_AuthHeaderLogo"

test/unit-tests/components/views/auth/__snapshots__/AuthPage-test.tsx.snap

@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`<VectorAuthPage /> should match snapshot 1`] = `
+exports[`<AuthPage /> should match snapshot 1`] = `
 <DocumentFragment>
   <div
     class="mx_AuthPage"

test/unit-tests/components/views/messages/MPollBody-test.tsx

@@ -7,7 +7,7 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import React from "react";
-import { fireEvent, render, RenderResult } from "jest-matrix-react";
+import { fireEvent, render, RenderResult, waitFor } from "jest-matrix-react";
 import {
     MatrixEvent,
     Relations,
@@ -83,7 +83,7 @@ describe("MPollBody", () => {
         expect(votesCount(renderResult, "poutine")).toBe("");
         expect(votesCount(renderResult, "italian")).toBe("");
         expect(votesCount(renderResult, "wings")).toBe("");
-        expect(renderResult.getByTestId("totalVotes").innerHTML).toBe("No votes cast");
+        await waitFor(() => expect(renderResult.getByTestId("totalVotes").innerHTML).toBe("No votes cast"));
         expect(renderResult.getByText("What should we order for the party?")).toBeTruthy();
     });
 

test/unit-tests/components/views/settings/JoinRuleSettings-test.tsx

@@ -59,7 +59,7 @@ describe("<JoinRuleSettings />", () => {
         onError: jest.fn(),
     };
     const getComponent = (props: Partial<JoinRuleSettingsProps> = {}) =>
-        render(<JoinRuleSettings {...defaultProps} {...props} />);
+        render(<JoinRuleSettings {...defaultProps} {...props} />, { legacyRoot: false });
 
     const setRoomStateEvents = (
         room: Room,

test/unit-tests/components/views/settings/SecureBackupPanel-test.tsx

@@ -130,10 +130,8 @@ describe("<SecureBackupPanel />", () => {
             })
             .mockResolvedValue(null);
         getComponent();
-        // flush checkKeyBackup promise
-        await flushPromises();
 
-        fireEvent.click(screen.getByText("Delete Backup"));
+        fireEvent.click(await screen.findByText("Delete Backup"));
 
         const dialog = await screen.findByRole("dialog");