Skip to content
This repository was archived by the owner on Oct 22, 2024. It is now read-only.

Commit 8650e41

Browse files
committed
Fix jest - 1
1 parent f451c3d commit 8650e41

File tree

4 files changed

+88
-53
lines changed

4 files changed

+88
-53
lines changed

src/components/views/elements/AccessibleButton.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ const AccessibleButton = forwardRef(function <T extends keyof JSX.IntrinsicEleme
212212
if (title) {
213213
return (
214214
<Tooltip
215-
label={title}
215+
description={title}
216216
caption={caption}
217217
isTriggerInteractive={true}
218218
placement={placement}

test/components/views/dialogs/RoomSettingsDialog-test.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import {
1717
RoomStateEvent,
1818
Visibility,
1919
} from "matrix-js-sdk/src/matrix";
20+
import { TooltipProvider } from "@vector-im/compound-web";
2021

2122
import { getMockClientWithEventEmitter, mockClientMethodsUser } from "../../../test-utils";
2223
import RoomSettingsDialog from "../../../../src/components/views/dialogs/RoomSettingsDialog";
@@ -65,7 +66,9 @@ describe("<RoomSettingsDialog />", () => {
6566
const getComponent = (onFinished = jest.fn(), propRoomId = roomId) =>
6667
render(<RoomSettingsDialog roomId={propRoomId} onFinished={onFinished} />, {
6768
wrapper: ({ children }) => (
68-
<MatrixClientContext.Provider value={mockClient}>{children}</MatrixClientContext.Provider>
69+
<MatrixClientContext.Provider value={mockClient}>
70+
<TooltipProvider>{children}</TooltipProvider>
71+
</MatrixClientContext.Provider>
6972
),
7073
});
7174

test/components/views/right_panel/UserInfo-test.tsx

Lines changed: 45 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ describe("<UserInfo />", () => {
312312
it("renders close button correctly when encryption panel with a pending verification request", async () => {
313313
renderComponent({ phase: RightPanelPhases.EncryptionPanel, verificationRequest });
314314
screen.getByTestId("base-card-close-button").focus();
315-
await expect(screen.findByRole("tooltip", { name: "Cancel" })).resolves.toBeInTheDocument();
315+
expect(screen.getByText("Cancel")).toBeInTheDocument();
316316
});
317317
});
318318

@@ -343,9 +343,12 @@ describe("<UserInfo />", () => {
343343

344344
it("renders the message button", () => {
345345
render(
346-
<MatrixClientContext.Provider value={mockClient}>
347-
<UserInfo {...defaultProps} />
348-
</MatrixClientContext.Provider>,
346+
<TooltipProvider>
347+
<MatrixClientContext.Provider value={mockClient}>
348+
<UserInfo {...defaultProps} />
349+
</MatrixClientContext.Provider>
350+
,
351+
</TooltipProvider>,
349352
);
350353

351354
screen.getByRole("button", { name: "Send message" });
@@ -358,9 +361,11 @@ describe("<UserInfo />", () => {
358361
},
359362
() => {
360363
render(
361-
<MatrixClientContext.Provider value={mockClient}>
362-
<UserInfo {...defaultProps} />
363-
</MatrixClientContext.Provider>,
364+
<TooltipProvider>
365+
<MatrixClientContext.Provider value={mockClient}>
366+
<UserInfo {...defaultProps} />
367+
</MatrixClientContext.Provider>
368+
</TooltipProvider>,
364369
);
365370

366371
expect(screen.queryByRole("button", { name: "Message" })).toBeNull();
@@ -706,7 +711,11 @@ describe("<UserInfoHeader />", () => {
706711

707712
const renderComponent = (props = {}) => {
708713
const Wrapper = (wrapperProps = {}) => {
709-
return <MatrixClientContext.Provider value={mockClient} {...wrapperProps} />;
714+
return (
715+
<TooltipProvider>
716+
<MatrixClientContext.Provider value={mockClient} {...wrapperProps} />
717+
</TooltipProvider>
718+
);
710719
};
711720

712721
return render(<UserInfoHeader {...defaultProps} {...props} />, {
@@ -748,9 +757,14 @@ describe("<DeviceItem />", () => {
748757
return <MatrixClientContext.Provider value={mockClient} {...wrapperProps} />;
749758
};
750759

751-
return render(<DeviceItem {...defaultProps} {...props} />, {
752-
wrapper: Wrapper,
753-
});
760+
return render(
761+
<TooltipProvider>
762+
<DeviceItem {...defaultProps} {...props} />
763+
</TooltipProvider>,
764+
{
765+
wrapper: Wrapper,
766+
},
767+
);
754768
};
755769

756770
const setMockDeviceTrust = (isVerified = false, isCrossSigningVerified = false) => {
@@ -888,7 +902,11 @@ describe("<UserOptionsSection />", () => {
888902

889903
const renderComponent = (props = {}) => {
890904
const Wrapper = (wrapperProps = {}) => {
891-
return <MatrixClientContext.Provider value={mockClient} {...wrapperProps} />;
905+
return (
906+
<TooltipProvider>
907+
<MatrixClientContext.Provider value={mockClient} {...wrapperProps} />
908+
</TooltipProvider>
909+
);
892910
};
893911

894912
return render(<UserOptionsSection {...defaultProps} {...props} />, {
@@ -1177,7 +1195,11 @@ describe("<RoomKickButton />", () => {
11771195

11781196
const renderComponent = (props = {}) => {
11791197
const Wrapper = (wrapperProps = {}) => {
1180-
return <MatrixClientContext.Provider value={mockClient} {...wrapperProps} />;
1198+
return (
1199+
<TooltipProvider>
1200+
<MatrixClientContext.Provider value={mockClient} {...wrapperProps} />
1201+
</TooltipProvider>
1202+
);
11811203
};
11821204

11831205
return render(<RoomKickButton {...defaultProps} {...props} />, {
@@ -1284,7 +1306,11 @@ describe("<BanToggleButton />", () => {
12841306

12851307
const renderComponent = (props = {}) => {
12861308
const Wrapper = (wrapperProps = {}) => {
1287-
return <MatrixClientContext.Provider value={mockClient} {...wrapperProps} />;
1309+
return (
1310+
<TooltipProvider>
1311+
<MatrixClientContext.Provider value={mockClient} {...wrapperProps} />
1312+
</TooltipProvider>
1313+
);
12881314
};
12891315

12901316
return render(<BanToggleButton {...defaultProps} {...props} />, {
@@ -1416,7 +1442,11 @@ describe("<RoomAdminToolsContainer />", () => {
14161442

14171443
const renderComponent = (props = {}) => {
14181444
const Wrapper = (wrapperProps = {}) => {
1419-
return <MatrixClientContext.Provider value={mockClient} {...wrapperProps} />;
1445+
return (
1446+
<TooltipProvider>
1447+
<MatrixClientContext.Provider value={mockClient} {...wrapperProps} />
1448+
</TooltipProvider>
1449+
);
14201450
};
14211451

14221452
return render(<RoomAdminToolsContainer {...defaultProps} {...props} />, {

0 commit comments

Comments
 (0)