This repository has been archived by the owner on Sep 11, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 833
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Use Compound tooltips more widely (#12128)
* Switch MIMageBody & MStickerBody to Compound Tooltip Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Switch E2ePadlock & SentReceipt to Compound Tooltips Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Workaround compound bug Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Fix tests Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Improve coverage Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Iterate tests Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Iterate tests Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Fix tests Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --------- Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
- Loading branch information
Showing
8 changed files
with
150 additions
and
76 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| /* | ||
| Copyright 2023 The Matrix.org Foundation C.I.C. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| import React from "react"; | ||
| import { render, screen } from "@testing-library/react"; | ||
| import { EventType, getHttpUriForMxc, MatrixEvent, Room } from "matrix-js-sdk/src/matrix"; | ||
| import fetchMock from "fetch-mock-jest"; | ||
| import userEvent from "@testing-library/user-event"; | ||
|
|
||
| import { RoomPermalinkCreator } from "../../../../src/utils/permalinks/Permalinks"; | ||
| import { | ||
| getMockClientWithEventEmitter, | ||
| mockClientMethodsCrypto, | ||
| mockClientMethodsDevice, | ||
| mockClientMethodsServer, | ||
| mockClientMethodsUser, | ||
| } from "../../../test-utils"; | ||
| import SettingsStore from "../../../../src/settings/SettingsStore"; | ||
| import MStickerBody from "../../../../src/components/views/messages/MStickerBody"; | ||
|
|
||
| describe("<MStickerBody/>", () => { | ||
| const userId = "@user:server"; | ||
| const deviceId = "DEADB33F"; | ||
| const cli = getMockClientWithEventEmitter({ | ||
| ...mockClientMethodsUser(userId), | ||
| ...mockClientMethodsServer(), | ||
| ...mockClientMethodsDevice(deviceId), | ||
| ...mockClientMethodsCrypto(), | ||
| getRooms: jest.fn().mockReturnValue([]), | ||
| getIgnoredUsers: jest.fn(), | ||
| getVersions: jest.fn().mockResolvedValue({ | ||
| unstable_features: { | ||
| "org.matrix.msc3882": true, | ||
| "org.matrix.msc3886": true, | ||
| }, | ||
| }), | ||
| }); | ||
| const url = "https://server/_matrix/media/v3/download/server/sticker"; | ||
| // eslint-disable-next-line no-restricted-properties | ||
| cli.mxcUrlToHttp.mockImplementation( | ||
| (mxcUrl: string, width?: number, height?: number, resizeMethod?: string, allowDirectLinks?: boolean) => { | ||
| return getHttpUriForMxc("https://server", mxcUrl, width, height, resizeMethod, allowDirectLinks); | ||
| }, | ||
| ); | ||
| const mediaEvent = new MatrixEvent({ | ||
| room_id: "!room:server", | ||
| sender: userId, | ||
| type: EventType.RoomMessage, | ||
| content: { | ||
| body: "sticker description", | ||
| info: { | ||
| w: 40, | ||
| h: 50, | ||
| }, | ||
| file: { | ||
| url: "mxc://server/sticker", | ||
| }, | ||
| }, | ||
| }); | ||
|
|
||
| const props = { | ||
| onHeightChanged: jest.fn(), | ||
| onMessageAllowed: jest.fn(), | ||
| permalinkCreator: new RoomPermalinkCreator(new Room(mediaEvent.getRoomId()!, cli, cli.getUserId()!)), | ||
| }; | ||
|
|
||
| beforeEach(() => { | ||
| jest.spyOn(SettingsStore, "getValue").mockRestore(); | ||
| fetchMock.mockReset(); | ||
| }); | ||
|
|
||
| it("should show a tooltip on hover", async () => { | ||
| fetchMock.getOnce(url, { status: 200 }); | ||
|
|
||
| render(<MStickerBody {...props} mxEvent={mediaEvent} />); | ||
|
|
||
| expect(screen.queryByRole("tooltip")).toBeNull(); | ||
| await userEvent.hover(screen.getByRole("img")); | ||
| await expect(screen.findByRole("tooltip")).resolves.toHaveTextContent("sticker description"); | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters