Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Flaky test SecurityRoomSettingsTab enables encryption after confirmation #10750

Merged
merged 4 commits into from
May 2, 2023
Merged

Flaky test SecurityRoomSettingsTab enables encryption after confirmation #10750

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3dc0766
try killing all modals before test
Apr 30, 2023
90a4a43
Merge branch 'develop' into kerry/25230/flaky-securityroomsettingstab…
Apr 30, 2023
7806450
lint
Apr 30, 2023
edb9773
Merge branch 'develop' into kerry/25230/flaky-securityroomsettingstab…
May 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions test/components/views/settings/tabs/room/SecurityRoomSettingsTab-test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,12 @@ import { logger } from "matrix-js-sdk/src/logger";
import SecurityRoomSettingsTab from "../../../../../../src/components/views/settings/tabs/room/SecurityRoomSettingsTab";
import MatrixClientContext from "../../../../../../src/contexts/MatrixClientContext";
import SettingsStore from "../../../../../../src/settings/SettingsStore";
import { flushPromises, getMockClientWithEventEmitter, mockClientMethodsUser } from "../../../../../test-utils";
import {
clearAllModals,
flushPromises,
getMockClientWithEventEmitter,
mockClientMethodsUser,
} from "../../../../../test-utils";
import { filterBoolean } from "../../../../../../src/utils/arrays";

describe("<SecurityRoomSettingsTab />", () => {
Expand Down Expand Up @@ -86,10 +91,12 @@ describe("<SecurityRoomSettingsTab />", () => {
room.currentState.setStateEvents(events);
};

beforeEach(() => {
beforeEach(async () => {
client.sendStateEvent.mockReset().mockResolvedValue({ event_id: "test" });
client.isRoomEncrypted.mockReturnValue(false);
jest.spyOn(SettingsStore, "getValue").mockRestore();

await clearAllModals();
});

describe("join rule", () => {
Expand Down Expand Up @@ -343,6 +350,7 @@ describe("<SecurityRoomSettingsTab />", () => {

const dialog = await screen.findByRole("dialog");

expect(within(dialog).getByText("Enable encryption?")).toBeInTheDocument();
fireEvent.click(within(dialog).getByText("OK"));

expect(client.sendStateEvent).toHaveBeenCalledWith(room.roomId, EventType.RoomEncryption, {
Expand Down