Flaky test SecurityRoomSettingsTab enables encryption after confirmation (#10750)

* try killing all modals before test

* lint
t3chguy/dedup-icons-17oct
Kerry 2023-05-02 19:46:32 +12:00 committed by GitHub
parent a81940b62a
commit 0adf465397
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions

View File

@ -22,7 +22,12 @@ import { logger } from "matrix-js-sdk/src/logger";
import SecurityRoomSettingsTab from "../../../../../../src/components/views/settings/tabs/room/SecurityRoomSettingsTab"; import SecurityRoomSettingsTab from "../../../../../../src/components/views/settings/tabs/room/SecurityRoomSettingsTab";
import MatrixClientContext from "../../../../../../src/contexts/MatrixClientContext"; import MatrixClientContext from "../../../../../../src/contexts/MatrixClientContext";
import SettingsStore from "../../../../../../src/settings/SettingsStore"; 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"; import { filterBoolean } from "../../../../../../src/utils/arrays";
describe("<SecurityRoomSettingsTab />", () => { describe("<SecurityRoomSettingsTab />", () => {
@ -86,10 +91,12 @@ describe("<SecurityRoomSettingsTab />", () => {
room.currentState.setStateEvents(events); room.currentState.setStateEvents(events);
}; };
beforeEach(() => { beforeEach(async () => {
client.sendStateEvent.mockReset().mockResolvedValue({ event_id: "test" }); client.sendStateEvent.mockReset().mockResolvedValue({ event_id: "test" });
client.isRoomEncrypted.mockReturnValue(false); client.isRoomEncrypted.mockReturnValue(false);
jest.spyOn(SettingsStore, "getValue").mockRestore(); jest.spyOn(SettingsStore, "getValue").mockRestore();
await clearAllModals();
}); });
describe("join rule", () => { describe("join rule", () => {
@ -343,6 +350,7 @@ describe("<SecurityRoomSettingsTab />", () => {
const dialog = await screen.findByRole("dialog"); const dialog = await screen.findByRole("dialog");
expect(within(dialog).getByText("Enable encryption?")).toBeInTheDocument();
fireEvent.click(within(dialog).getByText("OK")); fireEvent.click(within(dialog).getByText("OK"));
expect(client.sendStateEvent).toHaveBeenCalledWith(room.roomId, EventType.RoomEncryption, { expect(client.sendStateEvent).toHaveBeenCalledWith(room.roomId, EventType.RoomEncryption, {