Merge matrix-react-sdk into element-web

Merge remote-tracking branch 'repomerge/t3chguy/repomerge' into t3chguy/repo-merge

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

test/unit-tests/components/views/typography/Caption-test.tsx

@@ -0,0 +1,40 @@
+/*
+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 React from "react";
+import { render } from "jest-matrix-react";
+
+import { Caption } from "../../../../../src/components/views/typography/Caption";
+
+describe("<Caption />", () => {
+    const defaultProps = {
+        "children": "test",
+        "data-testid": "test test id",
+    };
+    const getComponent = (props = {}) => <Caption {...defaultProps} {...props} />;
+
+    it("renders plain text children", () => {
+        const { container } = render(getComponent());
+        expect({ container }).toMatchSnapshot();
+    });
+
+    it("renders an error message", () => {
+        const { container } = render(getComponent({ isError: true }));
+        expect({ container }).toMatchSnapshot();
+    });
+
+    it("renders react children", () => {
+        const children = (
+            <>
+                Test <b>test but bold</b>
+            </>
+        );
+        const { container } = render(getComponent({ children }));
+        expect({ container }).toMatchSnapshot();
+    });
+});