More fixes

element-hq · Sep 28, 2024 · 6e3ef61 · 6e3ef61
1 parent a9199a4
commit 6e3ef61
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 18 deletions.
diff --git a/src/components/views/messages/MStickerBody.tsx b/src/components/views/messages/MStickerBody.tsx
@@ -61,7 +61,7 @@ export default class MStickerBody extends MImageBody {
 
         return {
             placement: "right",
-            label: content.body,
+            description: content.body,
         };
     }
 

diff --git a/test/components/views/rooms/MessageComposer-test.tsx b/test/components/views/rooms/MessageComposer-test.tsx
@@ -8,7 +8,7 @@ Please see LICENSE files in the repository root for full details.
 
 import * as React from "react";
 import { EventType, MatrixEvent, Room, RoomMember, THREAD_RELATION_TYPE } from "matrix-js-sdk/src/matrix";
-import { act, fireEvent, render, screen, waitFor } from "jest-matrix-react";
+import { act, fireEvent, prettyDOM, render, screen, waitFor } from "jest-matrix-react";
 import userEvent from "@testing-library/user-event";
 
 import {
@@ -432,7 +432,7 @@ describe("MessageComposer", () => {
         });
     });
 
-    describe("for a LocalRoom", () => {
+    describe.only("for a LocalRoom", () => {
         const localRoom = new LocalRoom("!room:example.com", cli, cli.getUserId()!);
 
         it("should not show the stickers button", async () => {
@@ -444,7 +444,7 @@ describe("MessageComposer", () => {
         });
     });
 
-    it("wysiwyg correctly persists state to and from localStorage", async () => {
+    it.only("wysiwyg correctly persists state to and from localStorage", async () => {
         const room = mkStubRoom("!roomId:server", "Room 1", cli);
         const messageText = "Test Text";
         await SettingsStore.setValue("feature_wysiwyg_composer", null, SettingLevel.DEVICE, true);
@@ -458,14 +458,17 @@ describe("MessageComposer", () => {
         const key = `mx_wysiwyg_state_${room.roomId}`;
 
         await act(async () => {
+            console.log(prettyDOM(screen.getByRole("textbox")));
             await userEvent.click(screen.getByRole("textbox"));
+            await userEvent.keyboard(messageText);
+            expect(screen.getByRole("textbox")).toHaveTextContent(messageText);
+            // await waitFor(() => expect(screen.getByRole("textbox")).toHaveTextContent(messageText));
         });
-        fireEvent.input(screen.getByRole("textbox"), {
-            data: messageText,
-            inputType: "insertText",
-        });
-
-        await waitFor(() => expect(screen.getByRole("textbox")).toHaveTextContent(messageText));
+        // fireEvent.input(screen.getByRole("textbox"), {
+        //     data: messageText,
+        //     inputType: "insertText",
+        // });
+        // await waitFor(() => expect(screen.getByRole("textbox")).toHaveTextContent(messageText));
 
         // Wait for event dispatch to happen
         await act(async () => {

diff --git a/test/components/views/rooms/RoomHeader/CallGuestLinkButton-test.tsx b/test/components/views/rooms/RoomHeader/CallGuestLinkButton-test.tsx
@@ -99,7 +99,7 @@ describe("<CallGuestLinkButton />", () => {
 
     it("shows the JoinRuleDialog on click with private join rules", async () => {
         getComponent(room);
-        fireEvent.click(screen.getByLabelText("Share call link"));
+        fireEvent.click(screen.getByRole("button", { name: "Share call link" }));
         expect(modalSpy).toHaveBeenCalledWith(JoinRuleDialog, { room, canInvite: false });
         // pretend public was selected
         jest.spyOn(room, "getJoinRule").mockReturnValue(JoinRule.Public);
@@ -115,7 +115,7 @@ describe("<CallGuestLinkButton />", () => {
     it("shows the ShareDialog on click with public join rules", () => {
         jest.spyOn(room, "getJoinRule").mockReturnValue(JoinRule.Public);
         getComponent(room);
-        fireEvent.click(screen.getByLabelText("Share call link"));
+        fireEvent.click(screen.getByRole("button", { name: "Share call link" }));
         const callParams = modalSpy.mock.calls[0];
         expect(callParams[0]).toEqual(ShareDialog);
         expect(callParams[1].target.toString()).toEqual(expectedShareDialogProps.target);
@@ -127,7 +127,7 @@ describe("<CallGuestLinkButton />", () => {
         jest.spyOn(room, "getJoinRule").mockReturnValue(JoinRule.Knock);
         jest.spyOn(room, "canInvite").mockReturnValue(true);
         getComponent(room);
-        fireEvent.click(screen.getByLabelText("Share call link"));
+        fireEvent.click(screen.getByRole("button", { name: "Share call link" }));
         const callParams = modalSpy.mock.calls[0];
         expect(callParams[0]).toEqual(ShareDialog);
         expect(callParams[1].target.toString()).toEqual(expectedShareDialogProps.target);

diff --git a/test/components/views/spaces/ThreadsActivityCentre-test.tsx b/test/components/views/spaces/ThreadsActivityCentre-test.tsx
@@ -29,12 +29,12 @@ describe("ThreadsActivityCentre", () => {
         return screen.getByRole("menu");
     };
 
-    const getTACDescription = () => {
-        return screen.getByText("Threads");
+    const getTACDescription = (container: ReturnType<typeof render>["container"]) => {
+        return container.querySelector(".mx_ThreadsActivityCentreButton_Text");
     };
 
     const renderTAC = (props?: ComponentProps<typeof ThreadsActivityCentre>) => {
-        render(
+        return render(
             <MatrixClientContext.Provider value={cli}>
                 <ThreadsActivityCentre {...props} />
             </MatrixClientContext.Provider>,
@@ -130,9 +130,9 @@ describe("ThreadsActivityCentre", () => {
     });
 
     it("should render the threads activity centre button and the display label", async () => {
-        renderTAC({ displayButtonLabel: true });
+        const { container } = renderTAC({ displayButtonLabel: true });
         expect(getTACButton()).toBeInTheDocument();
-        expect(getTACDescription()).toBeInTheDocument();
+        expect(getTACDescription(container)).toBeInTheDocument();
     });
 
     it("should render the threads activity centre menu when the button is clicked", async () => {