PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Remove Enzyme tests in favour of React testing-library (#10289)

Browse source
This commit is contained in:
Michael Telatynski 2023-03-06 12:13:17 +00:00 committed by GitHub
parent 303b878b17
commit 667ec166d7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 432 additions and 3163 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
scripts/make-react-component.js
View file

@ -31,19 +31,19 @@ const %%ComponentName%%: React.FC<Props> = () => {
export default %%ComponentName%%; export default %%ComponentName%%;
`, `,
TEST: ` TEST: `
import React from 'react'; import React from "react";
import { mount } from 'enzyme'; import { render } from "@testing-library/react";
import %%ComponentName%% from '%%RelativeComponentPath%%'; import %%ComponentName%% from '%%RelativeComponentPath%%';
describe('<%%ComponentName%% />', () => { describe("<%%ComponentName%% />", () => {
const defaultProps = {}; const defaultProps = {};
const getComponent = (props = {}) => const getComponent = (props = {}) =>
mount(<%%ComponentName%% {...defaultProps} {...props} />); render(<%%ComponentName%% {...defaultProps} {...props} />);
it('renders', () => { it("matches snapshot", () => {
const component = getComponent(); const { asFragment } = getComponent();
expect(component).toBeTruthy(); expect(asFragment()).toMatchSnapshot()();
}); });
}); });
`, `,

7
src/components/views/dialogs/ExportDialog.tsx
View file

@ -110,11 +110,14 @@ const ExportDialog: React.FC<IProps> = ({ room, onFinished }) => {
const [displayCancel, setCancelWarning] = useState(false); const [displayCancel, setCancelWarning] = useState(false);
const [exportCancelled, setExportCancelled] = useState(false); const [exportCancelled, setExportCancelled] = useState(false);
const [exportSuccessful, setExportSuccessful] = useState(false); const [exportSuccessful, setExportSuccessful] = useState(false);
const [exporter, setExporter] = useStateCallback<Exporter>(null, async (exporter: Exporter): Promise<void> => { const [exporter, setExporter] = useStateCallback<Exporter | null>(
null,
async (exporter: Exporter | null): Promise<void> => {
await exporter?.export().then(() => { await exporter?.export().then(() => {
if (!exportCancelled) setExportSuccessful(true); if (!exportCancelled) setExportSuccessful(true);
}); });
}); },
);
const startExport = async (): Promise<void> => { const startExport = async (): Promise<void> => {
const exportOptions = { const exportOptions = {

18
test/components/structures/RoomView-test.tsx
View file

@ -14,16 +14,14 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
import React from "react"; import React, { createRef, RefObject } from "react";
// eslint-disable-next-line deprecate/import
import { mount, ReactWrapper } from "enzyme";
import { mocked, MockedObject } from "jest-mock"; import { mocked, MockedObject } from "jest-mock";
import { ClientEvent, MatrixClient } from "matrix-js-sdk/src/client"; import { ClientEvent, MatrixClient } from "matrix-js-sdk/src/client";
import { Room, RoomEvent } from "matrix-js-sdk/src/models/room"; import { Room, RoomEvent } from "matrix-js-sdk/src/models/room";
import { MatrixEvent } from "matrix-js-sdk/src/models/event"; import { MatrixEvent } from "matrix-js-sdk/src/models/event";
import { EventType, RoomStateEvent } from "matrix-js-sdk/src/matrix"; import { EventType, RoomStateEvent } from "matrix-js-sdk/src/matrix";
import { MEGOLM_ALGORITHM } from "matrix-js-sdk/src/crypto/olmlib"; import { MEGOLM_ALGORITHM } from "matrix-js-sdk/src/crypto/olmlib";
import { fireEvent, render, screen } from "@testing-library/react"; import { fireEvent, render, screen, RenderResult } from "@testing-library/react";
import { import {
stubClient, stubClient,
@ -98,7 +96,7 @@ describe("RoomView", () => {
jest.restoreAllMocks(); jest.restoreAllMocks();
}); });
const mountRoomView = async (): Promise<ReactWrapper> => { const mountRoomView = async (ref?: RefObject<_RoomView>): Promise<RenderResult> => {
if (stores.roomViewStore.getRoomId() !== room.roomId) { if (stores.roomViewStore.getRoomId() !== room.roomId) {
const switchedRoom = new Promise<void>((resolve) => { const switchedRoom = new Promise<void>((resolve) => {
const subFn = () => { const subFn = () => {
@ -119,7 +117,7 @@ describe("RoomView", () => {
await switchedRoom; await switchedRoom;
} }
const roomView = mount( const roomView = render(
<SDKContext.Provider value={stores}> <SDKContext.Provider value={stores}>
<RoomView <RoomView
// threepidInvite should be optional on RoomView props // threepidInvite should be optional on RoomView props
@ -127,6 +125,7 @@ describe("RoomView", () => {
threepidInvite={undefined as any} threepidInvite={undefined as any}
resizeNotifier={new ResizeNotifier()} resizeNotifier={new ResizeNotifier()}
forceTimeline={false} forceTimeline={false}
wrappedRef={ref as any}
/> />
</SDKContext.Provider>, </SDKContext.Provider>,
); );
@ -170,8 +169,11 @@ describe("RoomView", () => {
await flushPromises(); await flushPromises();
return roomView; return roomView;
}; };
const getRoomViewInstance = async (): Promise<_RoomView> => const getRoomViewInstance = async (): Promise<_RoomView> => {
(await mountRoomView()).find(_RoomView).instance() as _RoomView; const ref = createRef<_RoomView>();
await mountRoomView(ref);
return ref.current!;
};
it("when there is no room predecessor, getHiddenHighlightCount should return 0", async () => { it("when there is no room predecessor, getHiddenHighlightCount should return 0", async () => {
const instance = await getRoomViewInstance(); const instance = await getRoomViewInstance();

10
test/components/structures/TimelinePanel-test.tsx
View file

@ -15,8 +15,6 @@ limitations under the License.
*/ */
import { render, waitFor, screen } from "@testing-library/react"; import { render, waitFor, screen } from "@testing-library/react";
// eslint-disable-next-line deprecate/import
import { mount, ReactWrapper } from "enzyme";
import { ReceiptType } from "matrix-js-sdk/src/@types/read_receipts"; import { ReceiptType } from "matrix-js-sdk/src/@types/read_receipts";
import { import {
EventTimelineSet, EventTimelineSet,
@ -38,7 +36,7 @@ import {
ThreadEvent, ThreadEvent,
ThreadFilterType, ThreadFilterType,
} from "matrix-js-sdk/src/models/thread"; } from "matrix-js-sdk/src/models/thread";
import React from "react"; import React, { createRef } from "react";
import TimelinePanel from "../../../src/components/structures/TimelinePanel"; import TimelinePanel from "../../../src/components/structures/TimelinePanel";
import MatrixClientContext from "../../../src/contexts/MatrixClientContext"; import MatrixClientContext from "../../../src/contexts/MatrixClientContext";
@ -137,15 +135,17 @@ describe("TimelinePanel", () => {
// Create a TimelinePanel with ev0 already present // Create a TimelinePanel with ev0 already present
const timelineSet = new EventTimelineSet(room, {}); const timelineSet = new EventTimelineSet(room, {});
timelineSet.addLiveEvent(ev0); timelineSet.addLiveEvent(ev0);
const component: ReactWrapper<TimelinePanel> = mount( const ref = createRef<TimelinePanel>();
render(
<TimelinePanel <TimelinePanel
timelineSet={timelineSet} timelineSet={timelineSet}
manageReadMarkers={true} manageReadMarkers={true}
manageReadReceipts={true} manageReadReceipts={true}
eventId={ev0.getId()} eventId={ev0.getId()}
ref={ref}
/>, />,
); );
const timelinePanel = component.instance() as TimelinePanel; const timelinePanel = ref.current!;
// An event arrived, and we read it // An event arrived, and we read it
timelineSet.addLiveEvent(ev1); timelineSet.addLiveEvent(ev1);

79
test/components/views/context_menus/ContextMenu-test.tsx
View file

@ -15,8 +15,7 @@ limitations under the License.
*/ */
import React from "react"; import React from "react";
// eslint-disable-next-line deprecate/import import { render } from "@testing-library/react";
import { mount } from "enzyme";
import ContextMenu, { ChevronFace } from "../../../../src/components/structures/ContextMenu"; import ContextMenu, { ChevronFace } from "../../../../src/components/structures/ContextMenu";
import UIStore from "../../../../src/stores/UIStore"; import UIStore from "../../../../src/stores/UIStore";
@ -41,11 +40,11 @@ describe("<ContextMenu />", () => {
const targetChevronOffset = 25; const targetChevronOffset = 25;
describe("near top edge of window", () => { it("near top edge of window", () => {
const targetY = -50; const targetY = -50;
const onFinished = jest.fn(); const onFinished = jest.fn();
const wrapper = mount( render(
<ContextMenu <ContextMenu
bottom={windowSize - targetY - menuSize} bottom={windowSize - targetY - menuSize}
right={menuSize} right={menuSize}
@ -54,25 +53,25 @@ describe("<ContextMenu />", () => {
chevronOffset={targetChevronOffset} chevronOffset={targetChevronOffset}
/>, />,
); );
const chevron = wrapper.find(".mx_ContextualMenu_chevron_left"); const chevron = document.querySelector<HTMLElement>(".mx_ContextualMenu_chevron_left")!;
const bottomStyle = parseInt(wrapper.getDOMNode<HTMLElement>().style.getPropertyValue("bottom")); const bottomStyle = parseInt(
document.querySelector<HTMLElement>(".mx_ContextualMenu_wrapper")!.style.getPropertyValue("bottom"),
);
const actualY = windowSize - bottomStyle - menuSize; const actualY = windowSize - bottomStyle - menuSize;
const actualChevronOffset = parseInt(chevron.getDOMNode<HTMLElement>().style.getPropertyValue("top")); const actualChevronOffset = parseInt(chevron.style.getPropertyValue("top"));
it("stays within the window", () => { // stays within the window
expect(actualY).toBeGreaterThanOrEqual(0); expect(actualY).toBeGreaterThanOrEqual(0);
}); // positions the chevron correctly
it("positions the chevron correctly", () => {
expect(actualChevronOffset).toEqual(targetChevronOffset + targetY - actualY); expect(actualChevronOffset).toEqual(targetChevronOffset + targetY - actualY);
}); });
});
describe("near right edge of window", () => { it("near right edge of window", () => {
const targetX = windowSize - menuSize + 50; const targetX = windowSize - menuSize + 50;
const onFinished = jest.fn(); const onFinished = jest.fn();
const wrapper = mount( render(
<ContextMenu <ContextMenu
bottom={0} bottom={0}
onFinished={onFinished} onFinished={onFinished}
@ -81,24 +80,24 @@ describe("<ContextMenu />", () => {
chevronOffset={targetChevronOffset} chevronOffset={targetChevronOffset}
/>, />,
); );
const chevron = wrapper.find(".mx_ContextualMenu_chevron_top"); const chevron = document.querySelector<HTMLElement>(".mx_ContextualMenu_chevron_top")!;
const actualX = parseInt(wrapper.getDOMNode<HTMLElement>().style.getPropertyValue("left")); const actualX = parseInt(
const actualChevronOffset = parseInt(chevron.getDOMNode<HTMLElement>().style.getPropertyValue("left")); document.querySelector<HTMLElement>(".mx_ContextualMenu_wrapper")!.style.getPropertyValue("left"),
);
const actualChevronOffset = parseInt(chevron.style.getPropertyValue("left"));
it("stays within the window", () => { // stays within the window
expect(actualX + menuSize).toBeLessThanOrEqual(windowSize); expect(actualX + menuSize).toBeLessThanOrEqual(windowSize);
}); // positions the chevron correctly
it("positions the chevron correctly", () => {
expect(actualChevronOffset).toEqual(targetChevronOffset + targetX - actualX); expect(actualChevronOffset).toEqual(targetChevronOffset + targetX - actualX);
}); });
});
describe("near bottom edge of window", () => { it("near bottom edge of window", () => {
const targetY = windowSize - menuSize + 50; const targetY = windowSize - menuSize + 50;
const onFinished = jest.fn(); const onFinished = jest.fn();
const wrapper = mount( render(
<ContextMenu <ContextMenu
top={targetY} top={targetY}
left={0} left={0}
@ -107,24 +106,24 @@ describe("<ContextMenu />", () => {
chevronOffset={targetChevronOffset} chevronOffset={targetChevronOffset}
/>, />,
); );
const chevron = wrapper.find(".mx_ContextualMenu_chevron_right"); const chevron = document.querySelector<HTMLElement>(".mx_ContextualMenu_chevron_right")!;
const actualY = parseInt(wrapper.getDOMNode<HTMLElement>().style.getPropertyValue("top")); const actualY = parseInt(
const actualChevronOffset = parseInt(chevron.getDOMNode<HTMLElement>().style.getPropertyValue("top")); document.querySelector<HTMLElement>(".mx_ContextualMenu_wrapper")!.style.getPropertyValue("top"),
);
const actualChevronOffset = parseInt(chevron.style.getPropertyValue("top"));
it("stays within the window", () => { // stays within the window
expect(actualY + menuSize).toBeLessThanOrEqual(windowSize); expect(actualY + menuSize).toBeLessThanOrEqual(windowSize);
}); // positions the chevron correctly
it("positions the chevron correctly", () => {
expect(actualChevronOffset).toEqual(targetChevronOffset + targetY - actualY); expect(actualChevronOffset).toEqual(targetChevronOffset + targetY - actualY);
}); });
});
describe("near left edge of window", () => { it("near left edge of window", () => {
const targetX = -50; const targetX = -50;
const onFinished = jest.fn(); const onFinished = jest.fn();
const wrapper = mount( render(
<ContextMenu <ContextMenu
top={0} top={0}
right={windowSize - targetX - menuSize} right={windowSize - targetX - menuSize}
@ -133,25 +132,25 @@ describe("<ContextMenu />", () => {
chevronOffset={targetChevronOffset} chevronOffset={targetChevronOffset}
/>, />,
); );
const chevron = wrapper.find(".mx_ContextualMenu_chevron_bottom"); const chevron = document.querySelector<HTMLElement>(".mx_ContextualMenu_chevron_bottom")!;
const rightStyle = parseInt(wrapper.getDOMNode<HTMLElement>().style.getPropertyValue("right")); const rightStyle = parseInt(
document.querySelector<HTMLElement>(".mx_ContextualMenu_wrapper")!.style.getPropertyValue("right"),
);
const actualX = windowSize - rightStyle - menuSize; const actualX = windowSize - rightStyle - menuSize;
const actualChevronOffset = parseInt(chevron.getDOMNode<HTMLElement>().style.getPropertyValue("left")); const actualChevronOffset = parseInt(chevron.style.getPropertyValue("left"));
it("stays within the window", () => { // stays within the window
expect(actualX).toBeGreaterThanOrEqual(0); expect(actualX).toBeGreaterThanOrEqual(0);
}); // positions the chevron correctly
it("positions the chevron correctly", () => {
expect(actualChevronOffset).toEqual(targetChevronOffset + targetX - actualX); expect(actualChevronOffset).toEqual(targetChevronOffset + targetX - actualX);
}); });
});
it("should automatically close when a modal is opened", () => { it("should automatically close when a modal is opened", () => {
const targetX = -50; const targetX = -50;
const onFinished = jest.fn(); const onFinished = jest.fn();
mount( render(
<ContextMenu <ContextMenu
top={0} top={0}
right={windowSize - targetX - menuSize} right={windowSize - targetX - menuSize}
@ -171,7 +170,7 @@ describe("<ContextMenu />", () => {
const onFinished = jest.fn(); const onFinished = jest.fn();
Modal.createDialog(BaseDialog); Modal.createDialog(BaseDialog);
mount( render(
<ContextMenu <ContextMenu
top={0} top={0}
right={windowSize - targetX - menuSize} right={windowSize - targetX - menuSize}

174
test/components/views/context_menus/MessageContextMenu-test.tsx
View file

@ -15,8 +15,7 @@ limitations under the License.
*/ */
import React from "react"; import React from "react";
// eslint-disable-next-line deprecate/import import { fireEvent, render, RenderResult } from "@testing-library/react";
import { mount, ReactWrapper } from "enzyme";
import { EventStatus, MatrixEvent } from "matrix-js-sdk/src/models/event"; import { EventStatus, MatrixEvent } from "matrix-js-sdk/src/models/event";
import { Room } from "matrix-js-sdk/src/models/room"; import { Room } from "matrix-js-sdk/src/models/room";
import { import {
@ -30,7 +29,6 @@ import { M_POLL_KIND_DISCLOSED } from "matrix-js-sdk/src/@types/polls";
import { PollStartEvent } from "matrix-js-sdk/src/extensible_events_v1/PollStartEvent"; import { PollStartEvent } from "matrix-js-sdk/src/extensible_events_v1/PollStartEvent";
import { FeatureSupport, Thread } from "matrix-js-sdk/src/models/thread"; import { FeatureSupport, Thread } from "matrix-js-sdk/src/models/thread";
import { mocked } from "jest-mock"; import { mocked } from "jest-mock";
import { act } from "@testing-library/react";
import { MatrixClientPeg } from "../../../../src/MatrixClientPeg"; import { MatrixClientPeg } from "../../../../src/MatrixClientPeg";
import RoomContext, { TimelineRenderingType } from "../../../../src/contexts/RoomContext"; import RoomContext, { TimelineRenderingType } from "../../../../src/contexts/RoomContext";
@ -70,17 +68,16 @@ describe("MessageContextMenu", () => {
const props = { const props = {
link: "https://google.com/", link: "https://google.com/",
}; };
const menu = createMenuWithContent(eventContent, props); createMenuWithContent(eventContent, props);
const copyLinkButton = menu.find('a[aria-label="Copy link"]'); const copyLinkButton = document.querySelector('a[aria-label="Copy link"]');
expect(copyLinkButton).toHaveLength(1); expect(copyLinkButton).toHaveAttribute("href", props.link);
expect(copyLinkButton.props().href).toBe(props.link);
}); });
it("does not show copy link button when not supplied a link", () => { it("does not show copy link button when not supplied a link", () => {
const eventContent = createMessageEventContent("hello"); const eventContent = createMessageEventContent("hello");
const menu = createMenuWithContent(eventContent); createMenuWithContent(eventContent);
const copyLinkButton = menu.find('a[aria-label="Copy link"]'); const copyLinkButton = document.querySelector('a[aria-label="Copy link"]');
expect(copyLinkButton).toHaveLength(0); expect(copyLinkButton).toBeFalsy();
}); });
describe("message pinning", () => { describe("message pinning", () => {
@ -100,9 +97,9 @@ describe("MessageContextMenu", () => {
// mock permission to disallow adding pinned messages to room // mock permission to disallow adding pinned messages to room
jest.spyOn(room.currentState, "mayClientSendStateEvent").mockReturnValue(false); jest.spyOn(room.currentState, "mayClientSendStateEvent").mockReturnValue(false);
const menu = createMenu(event, {}, {}, undefined, room); createMenu(event, {}, {}, undefined, room);
expect(menu.find('div[aria-label="Pin"]')).toHaveLength(0); expect(document.querySelector('div[aria-label="Pin"]')).toBeFalsy();
}); });
it("does not show pin option for beacon_info event", () => { it("does not show pin option for beacon_info event", () => {
@ -112,9 +109,9 @@ describe("MessageContextMenu", () => {
// mock permission to allow adding pinned messages to room // mock permission to allow adding pinned messages to room
jest.spyOn(room.currentState, "mayClientSendStateEvent").mockReturnValue(true); jest.spyOn(room.currentState, "mayClientSendStateEvent").mockReturnValue(true);
const menu = createMenu(deadBeaconEvent, {}, {}, undefined, room); createMenu(deadBeaconEvent, {}, {}, undefined, room);
expect(menu.find('div[aria-label="Pin"]')).toHaveLength(0); expect(document.querySelector('div[aria-label="Pin"]')).toBeFalsy();
}); });
it("does not show pin option when pinning feature is disabled", () => { it("does not show pin option when pinning feature is disabled", () => {
@ -131,9 +128,9 @@ describe("MessageContextMenu", () => {
// disable pinning feature // disable pinning feature
jest.spyOn(SettingsStore, "getValue").mockReturnValue(false); jest.spyOn(SettingsStore, "getValue").mockReturnValue(false);
const menu = createMenu(pinnableEvent, {}, {}, undefined, room); createMenu(pinnableEvent, {}, {}, undefined, room);
expect(menu.find('div[aria-label="Pin"]')).toHaveLength(0); expect(document.querySelector('div[aria-label="Pin"]')).toBeFalsy();
}); });
it("shows pin option when pinning feature is enabled", () => { it("shows pin option when pinning feature is enabled", () => {
@ -148,9 +145,9 @@ describe("MessageContextMenu", () => {
// mock permission to allow adding pinned messages to room // mock permission to allow adding pinned messages to room
jest.spyOn(room.currentState, "mayClientSendStateEvent").mockReturnValue(true); jest.spyOn(room.currentState, "mayClientSendStateEvent").mockReturnValue(true);
const menu = createMenu(pinnableEvent, {}, {}, undefined, room); createMenu(pinnableEvent, {}, {}, undefined, room);
expect(menu.find('div[aria-label="Pin"]')).toHaveLength(1); expect(document.querySelector('div[aria-label="Pin"]')).toBeTruthy();
}); });
it("pins event on pin option click", () => { it("pins event on pin option click", () => {
@ -172,11 +169,9 @@ describe("MessageContextMenu", () => {
const pinsAccountData = new MatrixEvent({ content: { event_ids: ["!1", "!2"] } }); const pinsAccountData = new MatrixEvent({ content: { event_ids: ["!1", "!2"] } });
jest.spyOn(room, "getAccountData").mockReturnValue(pinsAccountData); jest.spyOn(room, "getAccountData").mockReturnValue(pinsAccountData);
const menu = createMenu(pinnableEvent, { onFinished }, {}, undefined, room); createMenu(pinnableEvent, { onFinished }, {}, undefined, room);
act(() => { fireEvent.click(document.querySelector('div[aria-label="Pin"]')!);
menu.find('div[aria-label="Pin"]').simulate("click");
});
// added to account data // added to account data
expect(client.setRoomAccountData).toHaveBeenCalledWith(roomId, ReadPinsEventId, { expect(client.setRoomAccountData).toHaveBeenCalledWith(roomId, ReadPinsEventId, {
@ -228,11 +223,9 @@ describe("MessageContextMenu", () => {
const pinsAccountData = new MatrixEvent({ content: { event_ids: ["!1", "!2"] } }); const pinsAccountData = new MatrixEvent({ content: { event_ids: ["!1", "!2"] } });
jest.spyOn(room, "getAccountData").mockReturnValue(pinsAccountData); jest.spyOn(room, "getAccountData").mockReturnValue(pinsAccountData);
const menu = createMenu(pinnableEvent, {}, {}, undefined, room); createMenu(pinnableEvent, {}, {}, undefined, room);
act(() => { fireEvent.click(document.querySelector('div[aria-label="Unpin"]')!);
menu.find('div[aria-label="Unpin"]').simulate("click");
});
expect(client.setRoomAccountData).not.toHaveBeenCalled(); expect(client.setRoomAccountData).not.toHaveBeenCalled();
@ -250,14 +243,14 @@ describe("MessageContextMenu", () => {
describe("message forwarding", () => { describe("message forwarding", () => {
it("allows forwarding a room message", () => { it("allows forwarding a room message", () => {
const eventContent = createMessageEventContent("hello"); const eventContent = createMessageEventContent("hello");
const menu = createMenuWithContent(eventContent); createMenuWithContent(eventContent);
expect(menu.find('div[aria-label="Forward"]')).toHaveLength(1); expect(document.querySelector('div[aria-label="Forward"]')).toBeTruthy();
}); });
it("does not allow forwarding a poll", () => { it("does not allow forwarding a poll", () => {
const eventContent = PollStartEvent.from("why?", ["42"], M_POLL_KIND_DISCLOSED); const eventContent = PollStartEvent.from("why?", ["42"], M_POLL_KIND_DISCLOSED);
const menu = createMenuWithContent(eventContent); createMenuWithContent(eventContent);
expect(menu.find('div[aria-label="Forward"]')).toHaveLength(0); expect(document.querySelector('div[aria-label="Forward"]')).toBeFalsy();
}); });
it("should not allow forwarding a voice broadcast", () => { it("should not allow forwarding a voice broadcast", () => {
@ -267,8 +260,8 @@ describe("MessageContextMenu", () => {
"@user:example.com", "@user:example.com",
"ABC123", "ABC123",
); );
const menu = createMenu(broadcastStartEvent); createMenu(broadcastStartEvent);
expect(menu.find('div[aria-label="Forward"]')).toHaveLength(0); expect(document.querySelector('div[aria-label="Forward"]')).toBeFalsy();
}); });
describe("forwarding beacons", () => { describe("forwarding beacons", () => {
@ -279,8 +272,8 @@ describe("MessageContextMenu", () => {
const beacon = new Beacon(deadBeaconEvent); const beacon = new Beacon(deadBeaconEvent);
const beacons = new Map<BeaconIdentifier, Beacon>(); const beacons = new Map<BeaconIdentifier, Beacon>();
beacons.set(getBeaconInfoIdentifier(deadBeaconEvent), beacon); beacons.set(getBeaconInfoIdentifier(deadBeaconEvent), beacon);
const menu = createMenu(deadBeaconEvent, {}, {}, beacons); createMenu(deadBeaconEvent, {}, {}, beacons);
expect(menu.find('div[aria-label="Forward"]')).toHaveLength(0); expect(document.querySelector('div[aria-label="Forward"]')).toBeFalsy();
}); });
it("does not allow forwarding a beacon that is not live but has a latestLocation", () => { it("does not allow forwarding a beacon that is not live but has a latestLocation", () => {
@ -294,8 +287,8 @@ describe("MessageContextMenu", () => {
beacon._latestLocationEvent = beaconLocation; beacon._latestLocationEvent = beaconLocation;
const beacons = new Map<BeaconIdentifier, Beacon>(); const beacons = new Map<BeaconIdentifier, Beacon>();
beacons.set(getBeaconInfoIdentifier(deadBeaconEvent), beacon); beacons.set(getBeaconInfoIdentifier(deadBeaconEvent), beacon);
const menu = createMenu(deadBeaconEvent, {}, {}, beacons); createMenu(deadBeaconEvent, {}, {}, beacons);
expect(menu.find('div[aria-label="Forward"]')).toHaveLength(0); expect(document.querySelector('div[aria-label="Forward"]')).toBeFalsy();
}); });
it("does not allow forwarding a live beacon that does not have a latestLocation", () => { it("does not allow forwarding a live beacon that does not have a latestLocation", () => {
@ -304,8 +297,8 @@ describe("MessageContextMenu", () => {
const beacon = new Beacon(beaconEvent); const beacon = new Beacon(beaconEvent);
const beacons = new Map<BeaconIdentifier, Beacon>(); const beacons = new Map<BeaconIdentifier, Beacon>();
beacons.set(getBeaconInfoIdentifier(beaconEvent), beacon); beacons.set(getBeaconInfoIdentifier(beaconEvent), beacon);
const menu = createMenu(beaconEvent, {}, {}, beacons); createMenu(beaconEvent, {}, {}, beacons);
expect(menu.find('div[aria-label="Forward"]')).toHaveLength(0); expect(document.querySelector('div[aria-label="Forward"]')).toBeFalsy();
}); });
it("allows forwarding a live beacon that has a location", () => { it("allows forwarding a live beacon that has a location", () => {
@ -319,8 +312,8 @@ describe("MessageContextMenu", () => {
beacon._latestLocationEvent = beaconLocation; beacon._latestLocationEvent = beaconLocation;
const beacons = new Map<BeaconIdentifier, Beacon>(); const beacons = new Map<BeaconIdentifier, Beacon>();
beacons.set(getBeaconInfoIdentifier(liveBeaconEvent), beacon); beacons.set(getBeaconInfoIdentifier(liveBeaconEvent), beacon);
const menu = createMenu(liveBeaconEvent, {}, {}, beacons); createMenu(liveBeaconEvent, {}, {}, beacons);
expect(menu.find('div[aria-label="Forward"]')).toHaveLength(1); expect(document.querySelector('div[aria-label="Forward"]')).toBeTruthy();
}); });
it("opens forward dialog with correct event", () => { it("opens forward dialog with correct event", () => {
@ -335,11 +328,9 @@ describe("MessageContextMenu", () => {
beacon._latestLocationEvent = beaconLocation; beacon._latestLocationEvent = beaconLocation;
const beacons = new Map<BeaconIdentifier, Beacon>(); const beacons = new Map<BeaconIdentifier, Beacon>();
beacons.set(getBeaconInfoIdentifier(liveBeaconEvent), beacon); beacons.set(getBeaconInfoIdentifier(liveBeaconEvent), beacon);
const menu = createMenu(liveBeaconEvent, {}, {}, beacons); createMenu(liveBeaconEvent, {}, {}, beacons);
act(() => { fireEvent.click(document.querySelector('div[aria-label="Forward"]')!);
menu.find('div[aria-label="Forward"]').simulate("click");
});
// called with forwardableEvent, not beaconInfo event // called with forwardableEvent, not beaconInfo event
expect(dispatchSpy).toHaveBeenCalledWith( expect(dispatchSpy).toHaveBeenCalledWith(
@ -354,8 +345,8 @@ describe("MessageContextMenu", () => {
describe("open as map link", () => { describe("open as map link", () => {
it("does not allow opening a plain message in open street maps", () => { it("does not allow opening a plain message in open street maps", () => {
const eventContent = createMessageEventContent("hello"); const eventContent = createMessageEventContent("hello");
const menu = createMenuWithContent(eventContent); createMenuWithContent(eventContent);
expect(menu.find('a[aria-label="Open in OpenStreetMap"]')).toHaveLength(0); expect(document.querySelector('a[aria-label="Open in OpenStreetMap"]')).toBeFalsy();
}); });
it("does not allow opening a beacon that does not have a shareable location event", () => { it("does not allow opening a beacon that does not have a shareable location event", () => {
@ -363,15 +354,16 @@ describe("MessageContextMenu", () => {
const beacon = new Beacon(deadBeaconEvent); const beacon = new Beacon(deadBeaconEvent);
const beacons = new Map<BeaconIdentifier, Beacon>(); const beacons = new Map<BeaconIdentifier, Beacon>();
beacons.set(getBeaconInfoIdentifier(deadBeaconEvent), beacon); beacons.set(getBeaconInfoIdentifier(deadBeaconEvent), beacon);
const menu = createMenu(deadBeaconEvent, {}, {}, beacons); createMenu(deadBeaconEvent, {}, {}, beacons);
expect(menu.find('a[aria-label="Open in OpenStreetMap"]')).toHaveLength(0); expect(document.querySelector('a[aria-label="Open in OpenStreetMap"]')).toBeFalsy();
}); });
it("allows opening a location event in open street map", () => { it("allows opening a location event in open street map", () => {
const locationEvent = makeLocationEvent("geo:50,50"); const locationEvent = makeLocationEvent("geo:50,50");
const menu = createMenu(locationEvent); createMenu(locationEvent);
// exists with a href with the lat/lon from the location event // exists with a href with the lat/lon from the location event
expect(menu.find('a[aria-label="Open in OpenStreetMap"]').at(0).props().href).toEqual( expect(document.querySelector('a[aria-label="Open in OpenStreetMap"]')).toHaveAttribute(
"href",
"https://www.openstreetmap.org/?mlat=50&mlon=50#map=16/50/50", "https://www.openstreetmap.org/?mlat=50&mlon=50#map=16/50/50",
); );
}); });
@ -387,9 +379,10 @@ describe("MessageContextMenu", () => {
beacon._latestLocationEvent = beaconLocation; beacon._latestLocationEvent = beaconLocation;
const beacons = new Map<BeaconIdentifier, Beacon>(); const beacons = new Map<BeaconIdentifier, Beacon>();
beacons.set(getBeaconInfoIdentifier(liveBeaconEvent), beacon); beacons.set(getBeaconInfoIdentifier(liveBeaconEvent), beacon);
const menu = createMenu(liveBeaconEvent, {}, {}, beacons); createMenu(liveBeaconEvent, {}, {}, beacons);
// exists with a href with the lat/lon from the location event // exists with a href with the lat/lon from the location event
expect(menu.find('a[aria-label="Open in OpenStreetMap"]').at(0).props().href).toEqual( expect(document.querySelector('a[aria-label="Open in OpenStreetMap"]')).toHaveAttribute(
"href",
"https://www.openstreetmap.org/?mlat=51&mlon=41#map=16/51/41", "https://www.openstreetmap.org/?mlat=51&mlon=41#map=16/51/41",
); );
}); });
@ -401,9 +394,9 @@ describe("MessageContextMenu", () => {
const eventContent = createMessageEventContent(text); const eventContent = createMessageEventContent(text);
mocked(getSelectedText).mockReturnValue(text); mocked(getSelectedText).mockReturnValue(text);
const menu = createRightClickMenuWithContent(eventContent); createRightClickMenuWithContent(eventContent);
const copyButton = menu.find('div[aria-label="Copy"]'); const copyButton = document.querySelector('div[aria-label="Copy"]')!;
copyButton.simulate("mousedown"); fireEvent.mouseDown(copyButton);
expect(copyPlaintext).toHaveBeenCalledWith(text); expect(copyPlaintext).toHaveBeenCalledWith(text);
}); });
@ -412,27 +405,27 @@ describe("MessageContextMenu", () => {
const eventContent = createMessageEventContent(text); const eventContent = createMessageEventContent(text);
mocked(getSelectedText).mockReturnValue(""); mocked(getSelectedText).mockReturnValue("");
const menu = createRightClickMenuWithContent(eventContent); createRightClickMenuWithContent(eventContent);
const copyButton = menu.find('div[aria-label="Copy"]'); const copyButton = document.querySelector('div[aria-label="Copy"]');
expect(copyButton).toHaveLength(0); expect(copyButton).toBeFalsy();
}); });
it("shows edit button when we can edit", () => { it("shows edit button when we can edit", () => {
const eventContent = createMessageEventContent("hello"); const eventContent = createMessageEventContent("hello");
mocked(canEditContent).mockReturnValue(true); mocked(canEditContent).mockReturnValue(true);
const menu = createRightClickMenuWithContent(eventContent); createRightClickMenuWithContent(eventContent);
const editButton = menu.find('div[aria-label="Edit"]'); const editButton = document.querySelector('div[aria-label="Edit"]');
expect(editButton).toHaveLength(1); expect(editButton).toBeTruthy();
}); });
it("does not show edit button when we cannot edit", () => { it("does not show edit button when we cannot edit", () => {
const eventContent = createMessageEventContent("hello"); const eventContent = createMessageEventContent("hello");
mocked(canEditContent).mockReturnValue(false); mocked(canEditContent).mockReturnValue(false);
const menu = createRightClickMenuWithContent(eventContent); createRightClickMenuWithContent(eventContent);
const editButton = menu.find('div[aria-label="Edit"]'); const editButton = document.querySelector('div[aria-label="Edit"]');
expect(editButton).toHaveLength(0); expect(editButton).toBeFalsy();
}); });
it("shows reply button when we can reply", () => { it("shows reply button when we can reply", () => {
@ -441,9 +434,9 @@ describe("MessageContextMenu", () => {
canSendMessages: true, canSendMessages: true,
}; };
const menu = createRightClickMenuWithContent(eventContent, context); createRightClickMenuWithContent(eventContent, context);
const replyButton = menu.find('div[aria-label="Reply"]'); const replyButton = document.querySelector('div[aria-label="Reply"]');
expect(replyButton).toHaveLength(1); expect(replyButton).toBeTruthy();
}); });
it("does not show reply button when we cannot reply", () => { it("does not show reply button when we cannot reply", () => {
@ -455,9 +448,9 @@ describe("MessageContextMenu", () => {
// queued messages are not actionable // queued messages are not actionable
unsentMessage.setStatus(EventStatus.QUEUED); unsentMessage.setStatus(EventStatus.QUEUED);
const menu = createMenu(unsentMessage, {}, context); createMenu(unsentMessage, {}, context);
const replyButton = menu.find('div[aria-label="Reply"]'); const replyButton = document.querySelector('div[aria-label="Reply"]');
expect(replyButton).toHaveLength(0); expect(replyButton).toBeFalsy();
}); });
it("shows react button when we can react", () => { it("shows react button when we can react", () => {
@ -466,9 +459,9 @@ describe("MessageContextMenu", () => {
canReact: true, canReact: true,
}; };
const menu = createRightClickMenuWithContent(eventContent, context); createRightClickMenuWithContent(eventContent, context);
const reactButton = menu.find('div[aria-label="React"]'); const reactButton = document.querySelector('div[aria-label="React"]');
expect(reactButton).toHaveLength(1); expect(reactButton).toBeTruthy();
}); });
it("does not show react button when we cannot react", () => { it("does not show react button when we cannot react", () => {
@ -477,9 +470,9 @@ describe("MessageContextMenu", () => {
canReact: false, canReact: false,
}; };
const menu = createRightClickMenuWithContent(eventContent, context); createRightClickMenuWithContent(eventContent, context);
const reactButton = menu.find('div[aria-label="React"]'); const reactButton = document.querySelector('div[aria-label="React"]');
expect(reactButton).toHaveLength(0); expect(reactButton).toBeFalsy();
}); });
it("shows view in room button when the event is a thread root", () => { it("shows view in room button when the event is a thread root", () => {
@ -493,17 +486,17 @@ describe("MessageContextMenu", () => {
timelineRenderingType: TimelineRenderingType.Thread, timelineRenderingType: TimelineRenderingType.Thread,
}; };
const menu = createMenu(mxEvent, props, context); createMenu(mxEvent, props, context);
const reactButton = menu.find('div[aria-label="View in room"]'); const reactButton = document.querySelector('div[aria-label="View in room"]');
expect(reactButton).toHaveLength(1); expect(reactButton).toBeTruthy();
}); });
it("does not show view in room button when the event is not a thread root", () => { it("does not show view in room button when the event is not a thread root", () => {
const eventContent = createMessageEventContent("hello"); const eventContent = createMessageEventContent("hello");
const menu = createRightClickMenuWithContent(eventContent); createRightClickMenuWithContent(eventContent);
const reactButton = menu.find('div[aria-label="View in room"]'); const reactButton = document.querySelector('div[aria-label="View in room"]');
expect(reactButton).toHaveLength(0); expect(reactButton).toBeFalsy();
}); });
it("creates a new thread on reply in thread click", () => { it("creates a new thread on reply in thread click", () => {
@ -516,11 +509,10 @@ describe("MessageContextMenu", () => {
}; };
jest.spyOn(SettingsStore, "getValue").mockReturnValue(true); jest.spyOn(SettingsStore, "getValue").mockReturnValue(true);
const menu = createRightClickMenu(mxEvent, context); createRightClickMenu(mxEvent, context);
const replyInThreadButton = menu.find('div[aria-label="Reply in thread"]'); const replyInThreadButton = document.querySelector('div[aria-label="Reply in thread"]')!;
expect(replyInThreadButton).toHaveLength(1); fireEvent.click(replyInThreadButton);
replyInThreadButton.simulate("click");
expect(dispatcher.dispatch).toHaveBeenCalledWith({ expect(dispatcher.dispatch).toHaveBeenCalledWith({
action: Action.ShowThread, action: Action.ShowThread,
@ -531,11 +523,11 @@ describe("MessageContextMenu", () => {
}); });
}); });
function createRightClickMenuWithContent(eventContent: object, context?: Partial<IRoomState>): ReactWrapper { function createRightClickMenuWithContent(eventContent: object, context?: Partial<IRoomState>): RenderResult {
return createMenuWithContent(eventContent, { rightClick: true }, context); return createMenuWithContent(eventContent, { rightClick: true }, context);
} }
function createRightClickMenu(mxEvent: MatrixEvent, context?: Partial<IRoomState>): ReactWrapper { function createRightClickMenu(mxEvent: MatrixEvent, context?: Partial<IRoomState>): RenderResult {
return createMenu(mxEvent, { rightClick: true }, context); return createMenu(mxEvent, { rightClick: true }, context);
} }
@ -543,7 +535,7 @@ function createMenuWithContent(
eventContent: object, eventContent: object,
props?: Partial<React.ComponentProps<typeof MessageContextMenu>>, props?: Partial<React.ComponentProps<typeof MessageContextMenu>>,
context?: Partial<IRoomState>, context?: Partial<IRoomState>,
): ReactWrapper { ): RenderResult {
// XXX: We probably shouldn't be assuming all events are going to be message events, but considering this // XXX: We probably shouldn't be assuming all events are going to be message events, but considering this
// test is for the Message context menu, it's a fairly safe assumption. // test is for the Message context menu, it's a fairly safe assumption.
const mxEvent = new MatrixEvent({ type: EventType.RoomMessage, content: eventContent }); const mxEvent = new MatrixEvent({ type: EventType.RoomMessage, content: eventContent });
@ -562,7 +554,7 @@ function createMenu(
context: Partial<IRoomState> = {}, context: Partial<IRoomState> = {},
beacons: Map<BeaconIdentifier, Beacon> = new Map(), beacons: Map<BeaconIdentifier, Beacon> = new Map(),
room: Room = makeDefaultRoom(), room: Room = makeDefaultRoom(),
): ReactWrapper { ): RenderResult {
const client = MatrixClientPeg.get(); const client = MatrixClientPeg.get();
// @ts-ignore illegally set private prop // @ts-ignore illegally set private prop
@ -573,7 +565,7 @@ function createMenu(
client.getUserId = jest.fn().mockReturnValue("@user:example.com"); client.getUserId = jest.fn().mockReturnValue("@user:example.com");
client.getRoom = jest.fn().mockReturnValue(room); client.getRoom = jest.fn().mockReturnValue(room);
return mount( return render(
<RoomContext.Provider value={context as IRoomState}> <RoomContext.Provider value={context as IRoomState}>
<MessageContextMenu mxEvent={mxEvent} onFinished={jest.fn()} {...props} /> <MessageContextMenu mxEvent={mxEvent} onFinished={jest.fn()} {...props} />
</RoomContext.Provider>, </RoomContext.Provider>,

115
test/components/views/dialogs/ExportDialog-test.tsx
View file

@ -15,11 +15,8 @@ limitations under the License.
*/ */
import React from "react"; import React from "react";
// eslint-disable-next-line deprecate/import import { fireEvent, render, RenderResult, waitFor } from "@testing-library/react";
import { mount, ReactWrapper } from "enzyme";
import { mocked } from "jest-mock"; import { mocked } from "jest-mock";
// eslint-disable-next-line deprecate/import
import { act } from "react-dom/test-utils";
import { Room } from "matrix-js-sdk/src/matrix"; import { Room } from "matrix-js-sdk/src/matrix";
import ExportDialog from "../../../../src/components/views/dialogs/ExportDialog"; import ExportDialog from "../../../../src/components/views/dialogs/ExportDialog";
@ -59,49 +56,28 @@ describe("<ExportDialog />", () => {
onFinished: jest.fn(), onFinished: jest.fn(),
}; };
const getComponent = (props = {}) => mount(<ExportDialog {...defaultProps} {...props} />); const getComponent = (props = {}) => render(<ExportDialog {...defaultProps} {...props} />);
const getSizeInput = (component: ReactWrapper) => component.find('input[id="size-limit"]'); const getSizeInput = ({ container }: RenderResult) => container.querySelector('input[id="size-limit"]')!;
const getExportTypeInput = (component: ReactWrapper) => component.find('select[id="export-type"]'); const getExportTypeInput = ({ container }: RenderResult) => container.querySelector('select[id="export-type"]')!;
const getAttachmentsCheckbox = (component: ReactWrapper) => component.find('input[id="include-attachments"]'); const getAttachmentsCheckbox = ({ container }: RenderResult) =>
const getMessageCountInput = (component: ReactWrapper) => component.find('input[id="message-count"]'); container.querySelector('input[id="include-attachments"]')!;
const getExportFormatInput = (component: ReactWrapper, format: ExportFormat) => const getMessageCountInput = ({ container }: RenderResult) => container.querySelector('input[id="message-count"]')!;
component.find(`input[id="exportFormat-${format}"]`); const getExportFormatInput = ({ container }: RenderResult, format: ExportFormat) =>
const getPrimaryButton = (component: ReactWrapper) => component.find('[data-testid="dialog-primary-button"]'); container.querySelector(`input[id="exportFormat-${format}"]`)!;
const getSecondaryButton = (component: ReactWrapper) => component.find('[data-testid="dialog-cancel-button"]'); const getPrimaryButton = ({ getByTestId }: RenderResult) => getByTestId("dialog-primary-button")!;
const getSecondaryButton = ({ getByTestId }: RenderResult) => getByTestId("dialog-cancel-button")!;
const submitForm = async (component: ReactWrapper) => const submitForm = async (component: RenderResult) => fireEvent.click(getPrimaryButton(component));
act(async () => { const selectExportFormat = async (component: RenderResult, format: ExportFormat) =>
getPrimaryButton(component).simulate("click"); fireEvent.click(getExportFormatInput(component, format));
component.setProps({}); const selectExportType = async (component: RenderResult, type: ExportType) =>
}); fireEvent.change(getExportTypeInput(component), { target: { value: type } });
const selectExportFormat = async (component: ReactWrapper, format: ExportFormat) => const setMessageCount = async (component: RenderResult, count: number) =>
act(async () => { fireEvent.change(getMessageCountInput(component), { target: { value: count } });
getExportFormatInput(component, format).simulate("change");
component.setProps({});
});
const selectExportType = async (component: ReactWrapper, type: ExportType) =>
act(async () => {
getExportTypeInput(component).simulate("change", { target: { value: type } });
component.setProps({});
});
const setMessageCount = async (component: ReactWrapper, count: number) =>
act(async () => {
getMessageCountInput(component).simulate("change", { target: { value: count } });
component.setProps({});
});
const setSizeLimit = async (component: ReactWrapper, limit: number) => const setSizeLimit = async (component: RenderResult, limit: number) =>
act(async () => { fireEvent.change(getSizeInput(component), { target: { value: limit } });
getSizeInput(component).simulate("change", { target: { value: limit } });
component.setProps({});
});
const setIncludeAttachments = async (component: ReactWrapper, checked: boolean) =>
act(async () => {
getAttachmentsCheckbox(component).simulate("change", { target: { checked } });
component.setProps({});
});
beforeEach(() => { beforeEach(() => {
HTMLExporterMock.mockClear().mockImplementation(jest.fn().mockReturnValue(htmlExporterInstance)); HTMLExporterMock.mockClear().mockImplementation(jest.fn().mockReturnValue(htmlExporterInstance));
@ -115,15 +91,13 @@ describe("<ExportDialog />", () => {
it("renders export dialog", () => { it("renders export dialog", () => {
const component = getComponent(); const component = getComponent();
expect(component.find(".mx_ExportDialog")).toMatchSnapshot(); expect(component.container.querySelector(".mx_ExportDialog")).toMatchSnapshot();
}); });
it("calls onFinished when cancel button is clicked", () => { it("calls onFinished when cancel button is clicked", () => {
const onFinished = jest.fn(); const onFinished = jest.fn();
const component = getComponent({ onFinished }); const component = getComponent({ onFinished });
act(() => { fireEvent.click(getSecondaryButton(component));
getSecondaryButton(component).simulate("click");
});
expect(onFinished).toHaveBeenCalledWith(false); expect(onFinished).toHaveBeenCalledWith(false);
}); });
@ -131,6 +105,7 @@ describe("<ExportDialog />", () => {
const component = getComponent(); const component = getComponent();
await submitForm(component); await submitForm(component);
await waitFor(() => {
// 4th arg is an component function // 4th arg is an component function
const exportConstructorProps = HTMLExporterMock.mock.calls[0].slice(0, 3); const exportConstructorProps = HTMLExporterMock.mock.calls[0].slice(0, 3);
expect(exportConstructorProps).toEqual([ expect(exportConstructorProps).toEqual([
@ -142,6 +117,7 @@ describe("<ExportDialog />", () => {
numberOfMessages: 100, numberOfMessages: 100,
}, },
]); ]);
});
expect(htmlExporterInstance.export).toHaveBeenCalled(); expect(htmlExporterInstance.export).toHaveBeenCalled();
}); });
@ -173,29 +149,28 @@ describe("<ExportDialog />", () => {
it("renders success screen when export is finished", async () => { it("renders success screen when export is finished", async () => {
const component = getComponent(); const component = getComponent();
await submitForm(component); await submitForm(component);
component.setProps({});
jest.runAllTimers(); jest.runAllTimers();
expect(component.find(".mx_InfoDialog .mx_Dialog_content")).toMatchSnapshot(); expect(component.container.querySelector(".mx_InfoDialog .mx_Dialog_content")).toMatchSnapshot();
}); });
describe("export format", () => { describe("export format", () => {
it("renders export format with html selected by default", () => { it("renders export format with html selected by default", () => {
const component = getComponent(); const component = getComponent();
expect(getExportFormatInput(component, ExportFormat.Html).props().checked).toBeTruthy(); expect(getExportFormatInput(component, ExportFormat.Html)).toBeChecked();
}); });
it("sets export format on radio button click", async () => { it("sets export format on radio button click", async () => {
const component = getComponent(); const component = getComponent();
await selectExportFormat(component, ExportFormat.PlainText); await selectExportFormat(component, ExportFormat.PlainText);
expect(getExportFormatInput(component, ExportFormat.PlainText).props().checked).toBeTruthy(); expect(getExportFormatInput(component, ExportFormat.PlainText)).toBeChecked();
expect(getExportFormatInput(component, ExportFormat.Html).props().checked).toBeFalsy(); expect(getExportFormatInput(component, ExportFormat.Html)).not.toBeChecked();
}); });
it("hides export format input when format is valid in ForceRoomExportParameters", () => { it("hides export format input when format is valid in ForceRoomExportParameters", () => {
const component = getComponent(); const component = getComponent();
expect(getExportFormatInput(component, ExportFormat.Html).props().checked).toBeTruthy(); expect(getExportFormatInput(component, ExportFormat.Html)).toBeChecked();
}); });
it("does not render export format when set in ForceRoomExportParameters", () => { it("does not render export format when set in ForceRoomExportParameters", () => {
@ -203,20 +178,20 @@ describe("<ExportDialog />", () => {
format: ExportFormat.PlainText, format: ExportFormat.PlainText,
}); });
const component = getComponent(); const component = getComponent();
expect(getExportFormatInput(component, ExportFormat.Html).length).toBeFalsy(); expect(getExportFormatInput(component, ExportFormat.Html)).toBeFalsy();
}); });
}); });
describe("export type", () => { describe("export type", () => {
it("renders export type with timeline selected by default", () => { it("renders export type with timeline selected by default", () => {
const component = getComponent(); const component = getComponent();
expect(getExportTypeInput(component).props().value).toEqual(ExportType.Timeline); expect(getExportTypeInput(component)).toHaveValue(ExportType.Timeline);
}); });
it("sets export type on change", async () => { it("sets export type on change", async () => {
const component = getComponent(); const component = getComponent();
await selectExportType(component, ExportType.Beginning); await selectExportType(component, ExportType.Beginning);
expect(getExportTypeInput(component).props().value).toEqual(ExportType.Beginning); expect(getExportTypeInput(component)).toHaveValue(ExportType.Beginning);
}); });
it("does not render export type when set in ForceRoomExportParameters", () => { it("does not render export type when set in ForceRoomExportParameters", () => {
@ -224,25 +199,25 @@ describe("<ExportDialog />", () => {
range: ExportType.Beginning, range: ExportType.Beginning,
}); });
const component = getComponent(); const component = getComponent();
expect(getExportTypeInput(component).length).toBeFalsy(); expect(getExportTypeInput(component)).toBeFalsy();
}); });
it("does not render message count input", async () => { it("does not render message count input", async () => {
const component = getComponent(); const component = getComponent();
expect(getMessageCountInput(component).length).toBeFalsy(); expect(getMessageCountInput(component)).toBeFalsy();
}); });
it("renders message count input with default value 100 when export type is lastNMessages", async () => { it("renders message count input with default value 100 when export type is lastNMessages", async () => {
const component = getComponent(); const component = getComponent();
await selectExportType(component, ExportType.LastNMessages); await selectExportType(component, ExportType.LastNMessages);
expect(getMessageCountInput(component).props().value).toEqual("100"); expect(getMessageCountInput(component)).toHaveValue(100);
}); });
it("sets message count on change", async () => { it("sets message count on change", async () => {
const component = getComponent(); const component = getComponent();
await selectExportType(component, ExportType.LastNMessages); await selectExportType(component, ExportType.LastNMessages);
await setMessageCount(component, 10); await setMessageCount(component, 10);
expect(getMessageCountInput(component).props().value).toEqual("10"); expect(getMessageCountInput(component)).toHaveValue(10);
}); });
it("does not export when export type is lastNMessages and message count is falsy", async () => { it("does not export when export type is lastNMessages and message count is falsy", async () => {
@ -270,20 +245,22 @@ describe("<ExportDialog />", () => {
await selectExportType(component, ExportType.Timeline); await selectExportType(component, ExportType.Timeline);
await submitForm(component); await submitForm(component);
await waitFor(() => {
expect(htmlExporterInstance.export).toHaveBeenCalled(); expect(htmlExporterInstance.export).toHaveBeenCalled();
}); });
}); });
});
describe("size limit", () => { describe("size limit", () => {
it("renders size limit input with default value", () => { it("renders size limit input with default value", () => {
const component = getComponent(); const component = getComponent();
expect(getSizeInput(component).props().value).toEqual("8"); expect(getSizeInput(component)).toHaveValue(8);
}); });
it("updates size limit on change", async () => { it("updates size limit on change", async () => {
const component = getComponent(); const component = getComponent();
await setSizeLimit(component, 20); await setSizeLimit(component, 20);
expect(getSizeInput(component).props().value).toEqual("20"); expect(getSizeInput(component)).toHaveValue(20);
}); });
it("does not export when size limit is falsy", async () => { it("does not export when size limit is falsy", async () => {
@ -307,15 +284,17 @@ describe("<ExportDialog />", () => {
await setSizeLimit(component, 2000); await setSizeLimit(component, 2000);
await submitForm(component); await submitForm(component);
await waitFor(() => {
expect(htmlExporterInstance.export).toHaveBeenCalled(); expect(htmlExporterInstance.export).toHaveBeenCalled();
}); });
});
it("does not render size limit input when set in ForceRoomExportParameters", () => { it("does not render size limit input when set in ForceRoomExportParameters", () => {
mocked(ChatExportMock.getForceChatExportParameters!).mockReturnValue({ mocked(ChatExportMock.getForceChatExportParameters!).mockReturnValue({
sizeMb: 10000, sizeMb: 10000,
}); });
const component = getComponent(); const component = getComponent();
expect(getSizeInput(component).length).toBeFalsy(); expect(getSizeInput(component)).toBeFalsy();
}); });
/** /**
@ -335,13 +314,13 @@ describe("<ExportDialog />", () => {
describe("include attachments", () => { describe("include attachments", () => {
it("renders input with default value of false", () => { it("renders input with default value of false", () => {
const component = getComponent(); const component = getComponent();
expect(getAttachmentsCheckbox(component).props().checked).toEqual(false); expect(getAttachmentsCheckbox(component)).not.toBeChecked();
}); });
it("updates include attachments on change", async () => { it("updates include attachments on change", async () => {
const component = getComponent(); const component = getComponent();
await setIncludeAttachments(component, true); fireEvent.click(getAttachmentsCheckbox(component));
expect(getAttachmentsCheckbox(component).props().checked).toEqual(true); expect(getAttachmentsCheckbox(component)).toBeChecked();
}); });
it("does not render input when set in ForceRoomExportParameters", () => { it("does not render input when set in ForceRoomExportParameters", () => {
@ -349,7 +328,7 @@ describe("<ExportDialog />", () => {
includeAttachments: false, includeAttachments: false,
}); });
const component = getComponent(); const component = getComponent();
expect(getAttachmentsCheckbox(component).length).toBeFalsy(); expect(getAttachmentsCheckbox(component)).toBeFalsy();
}); });
}); });
}); });

3097
test/components/views/dialogs/__snapshots__/ExportDialog-test.tsx.snap
View file

File diff suppressed because it is too large Load diff

71
test/components/views/right_panel/PinnedMessagesCard-test.tsx
View file

@ -14,11 +14,9 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
import React, { ComponentProps } from "react"; import React from "react";
// eslint-disable-next-line deprecate/import import { render, act, RenderResult } from "@testing-library/react";
import { mount, ReactWrapper } from "enzyme";
import { mocked } from "jest-mock"; import { mocked } from "jest-mock";
import { act } from "react-dom/test-utils";
import { MatrixEvent } from "matrix-js-sdk/src/models/event"; import { MatrixEvent } from "matrix-js-sdk/src/models/event";
import { EventType, RelationType, MsgType } from "matrix-js-sdk/src/@types/event"; import { EventType, RelationType, MsgType } from "matrix-js-sdk/src/@types/event";
import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state"; import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state";
@ -31,8 +29,6 @@ import { PollEndEvent } from "matrix-js-sdk/src/extensible_events_v1/PollEndEven
import { stubClient, mkEvent, mkMessage, flushPromises } from "../../../test-utils"; import { stubClient, mkEvent, mkMessage, flushPromises } from "../../../test-utils";
import { MatrixClientPeg } from "../../../../src/MatrixClientPeg"; import { MatrixClientPeg } from "../../../../src/MatrixClientPeg";
import PinnedMessagesCard from "../../../../src/components/views/right_panel/PinnedMessagesCard"; import PinnedMessagesCard from "../../../../src/components/views/right_panel/PinnedMessagesCard";
import PinnedEventTile from "../../../../src/components/views/rooms/PinnedEventTile";
import MPollBody from "../../../../src/components/views/messages/MPollBody";
import MatrixClientContext from "../../../../src/contexts/MatrixClientContext"; import MatrixClientContext from "../../../../src/contexts/MatrixClientContext";
import { RoomPermalinkCreator } from "../../../../src/utils/permalinks/Permalinks"; import { RoomPermalinkCreator } from "../../../../src/utils/permalinks/Permalinks";
@ -82,30 +78,26 @@ describe("<PinnedMessagesCard />", () => {
return room; return room;
}; };
const mountPins = async (room: Room): Promise<ReactWrapper<ComponentProps<typeof PinnedMessagesCard>>> => { const mountPins = async (room: Room): Promise<RenderResult> => {
let pins!: ReactWrapper<ComponentProps<typeof PinnedMessagesCard>>; let pins!: RenderResult;
await act(async () => { await act(async () => {
pins = mount( pins = render(
<MatrixClientContext.Provider value={cli}>
<PinnedMessagesCard <PinnedMessagesCard
room={room} room={room}
onClose={jest.fn()} onClose={jest.fn()}
permalinkCreator={new RoomPermalinkCreator(room, room.roomId)} permalinkCreator={new RoomPermalinkCreator(room, room.roomId)}
/>, />
{ </MatrixClientContext.Provider>,
wrappingComponent: MatrixClientContext.Provider,
wrappingComponentProps: { value: cli },
},
); );
// Wait a tick for state updates // Wait a tick for state updates
await new Promise((resolve) => setImmediate(resolve)); await new Promise((resolve) => setImmediate(resolve));
}); });
pins.update();
return pins; return pins;
}; };
const emitPinUpdates = async (pins: ReactWrapper<ComponentProps<typeof PinnedMessagesCard>>) => { const emitPinUpdates = async (room: Room) => {
const room = pins.props().room;
const pinListener = mocked(room.currentState).on.mock.calls.find( const pinListener = mocked(room.currentState).on.mock.calls.find(
([eventName, listener]) => eventName === RoomStateEvent.Events, ([eventName, listener]) => eventName === RoomStateEvent.Events,
)![1]; )![1];
@ -117,7 +109,6 @@ describe("<PinnedMessagesCard />", () => {
// Wait a tick for state updates // Wait a tick for state updates
await new Promise((resolve) => setImmediate(resolve)); await new Promise((resolve) => setImmediate(resolve));
}); });
pins.update();
}; };
const pin1 = mkMessage({ const pin1 = mkMessage({
@ -137,36 +128,38 @@ describe("<PinnedMessagesCard />", () => {
// Start with nothing pinned // Start with nothing pinned
const localPins: MatrixEvent[] = []; const localPins: MatrixEvent[] = [];
const nonLocalPins: MatrixEvent[] = []; const nonLocalPins: MatrixEvent[] = [];
const pins = await mountPins(mkRoom(localPins, nonLocalPins)); const room = mkRoom(localPins, nonLocalPins);
expect(pins.find(PinnedEventTile).length).toBe(0); const pins = await mountPins(room);
expect(pins.container.querySelectorAll(".mx_PinnedEventTile")).toHaveLength(0);
// Pin the first message // Pin the first message
localPins.push(pin1); localPins.push(pin1);
await emitPinUpdates(pins); await emitPinUpdates(room);
expect(pins.find(PinnedEventTile).length).toBe(1); expect(pins.container.querySelectorAll(".mx_PinnedEventTile")).toHaveLength(1);
// Pin the second message // Pin the second message
nonLocalPins.push(pin2); nonLocalPins.push(pin2);
await emitPinUpdates(pins); await emitPinUpdates(room);
expect(pins.find(PinnedEventTile).length).toBe(2); expect(pins.container.querySelectorAll(".mx_PinnedEventTile")).toHaveLength(2);
}); });
it("updates when messages are unpinned", async () => { it("updates when messages are unpinned", async () => {
// Start with two pins // Start with two pins
const localPins = [pin1]; const localPins = [pin1];
const nonLocalPins = [pin2]; const nonLocalPins = [pin2];
const pins = await mountPins(mkRoom(localPins, nonLocalPins)); const room = mkRoom(localPins, nonLocalPins);
expect(pins.find(PinnedEventTile).length).toBe(2); const pins = await mountPins(room);
expect(pins.container.querySelectorAll(".mx_PinnedEventTile")).toHaveLength(2);
// Unpin the first message // Unpin the first message
localPins.pop(); localPins.pop();
await emitPinUpdates(pins); await emitPinUpdates(room);
expect(pins.find(PinnedEventTile).length).toBe(1); expect(pins.container.querySelectorAll(".mx_PinnedEventTile")).toHaveLength(1);
// Unpin the second message // Unpin the second message
nonLocalPins.pop(); nonLocalPins.pop();
await emitPinUpdates(pins); await emitPinUpdates(room);
expect(pins.find(PinnedEventTile).length).toBe(0); expect(pins.container.querySelectorAll(".mx_PinnedEventTile")).toHaveLength(0);
}); });
it("hides unpinnable events found in local timeline", async () => { it("hides unpinnable events found in local timeline", async () => {
@ -181,7 +174,7 @@ describe("<PinnedMessagesCard />", () => {
}); });
const pins = await mountPins(mkRoom([pin], [])); const pins = await mountPins(mkRoom([pin], []));
expect(pins.find(PinnedEventTile).length).toBe(0); expect(pins.container.querySelectorAll(".mx_PinnedEventTile")).toHaveLength(0);
}); });
it("hides unpinnable events not found in local timeline", async () => { it("hides unpinnable events not found in local timeline", async () => {
@ -196,7 +189,7 @@ describe("<PinnedMessagesCard />", () => {
}); });
const pins = await mountPins(mkRoom([], [pin])); const pins = await mountPins(mkRoom([], [pin]));
expect(pins.find(PinnedEventTile).length).toBe(0); expect(pins.container.querySelectorAll(".mx_PinnedEventTile")).toHaveLength(0);
}); });
it("accounts for edits", async () => { it("accounts for edits", async () => {
@ -224,9 +217,9 @@ describe("<PinnedMessagesCard />", () => {
}); });
const pins = await mountPins(mkRoom([], [pin1])); const pins = await mountPins(mkRoom([], [pin1]));
const pinTile = pins.find(PinnedEventTile); const pinTile = pins.container.querySelectorAll(".mx_PinnedEventTile");
expect(pinTile.length).toBe(1); expect(pinTile.length).toBe(1);
expect(pinTile.find(".mx_EventTile_body").text()).toEqual("First pinned message, edited"); expect(pinTile[0].querySelector(".mx_EventTile_body")!).toHaveTextContent("First pinned message, edited");
}); });
it("displays votes on polls not found in local timeline", async () => { it("displays votes on polls not found in local timeline", async () => {
@ -284,11 +277,11 @@ describe("<PinnedMessagesCard />", () => {
const pollInstance = room.polls.get(poll.getId()!); const pollInstance = room.polls.get(poll.getId()!);
expect(pollInstance).toBeTruthy(); expect(pollInstance).toBeTruthy();
const pinTile = pins.find(MPollBody); const pinTile = pins.container.querySelectorAll(".mx_MPollBody");
expect(pinTile.length).toEqual(1); expect(pinTile).toHaveLength(1);
expect(pinTile.find(".mx_PollOption_ended").length).toEqual(2); expect(pinTile[0].querySelectorAll(".mx_PollOption_ended")).toHaveLength(2);
expect(pinTile.find(".mx_PollOption_optionVoteCount").first().text()).toEqual("2 votes"); expect(pinTile[0].querySelectorAll(".mx_PollOption_optionVoteCount")[0]).toHaveTextContent("2 votes");
expect(pinTile.find(".mx_PollOption_optionVoteCount").last().text()).toEqual("1 vote"); expect([...pinTile[0].querySelectorAll(".mx_PollOption_optionVoteCount")].at(-1)).toHaveTextContent("1 vote");
}); });
}); });

4
test/test-utils/wrappers.tsx
View file

@ -14,14 +14,14 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
import React, { RefCallback, ComponentType } from "react"; import React, { ComponentType, Ref } from "react";
import { MatrixClient } from "matrix-js-sdk/src/matrix"; import { MatrixClient } from "matrix-js-sdk/src/matrix";
import { MatrixClientPeg as peg } from "../../src/MatrixClientPeg"; import { MatrixClientPeg as peg } from "../../src/MatrixClientPeg";
import MatrixClientContext from "../../src/contexts/MatrixClientContext"; import MatrixClientContext from "../../src/contexts/MatrixClientContext";
import { SDKContext, SdkContextClass } from "../../src/contexts/SDKContext"; import { SDKContext, SdkContextClass } from "../../src/contexts/SDKContext";
type WrapperProps<T> = { wrappedRef?: RefCallback<ComponentType<T>> } & T; type WrapperProps<T> = { wrappedRef?: Ref<ComponentType<T>> } & T;
export function wrapInMatrixClientContext<T>(WrappedComponent: ComponentType<T>): ComponentType<WrapperProps<T>> { export function wrapInMatrixClientContext<T>(WrappedComponent: ComponentType<T>): ComponentType<WrapperProps<T>> {
class Wrapper extends React.Component<WrapperProps<T>> { class Wrapper extends React.Component<WrapperProps<T>> {