From 3dc0766907ef34e9d6def4a8bf457d5ce351242b Mon Sep 17 00:00:00 2001
From: Kerry Archibald <kerrya@element.io>
Date: Mon, 1 May 2023 11:24:10 +1200
Subject: [PATCH 1/2] try killing all modals before test

---
 .../settings/tabs/room/SecurityRoomSettingsTab-test.tsx    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/test/components/views/settings/tabs/room/SecurityRoomSettingsTab-test.tsx b/test/components/views/settings/tabs/room/SecurityRoomSettingsTab-test.tsx
index e2b4e494645..a7a7f830f3e 100644
--- a/test/components/views/settings/tabs/room/SecurityRoomSettingsTab-test.tsx
+++ b/test/components/views/settings/tabs/room/SecurityRoomSettingsTab-test.tsx
@@ -22,7 +22,7 @@ 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 />", () => {
@@ -86,10 +86,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", () => {
@@ -343,6 +345,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, {

From 7806450f548379c8ceca521e7accc443fb01875c Mon Sep 17 00:00:00 2001
From: Kerry Archibald <kerrya@element.io>
Date: Mon, 1 May 2023 11:42:17 +1200
Subject: [PATCH 2/2] lint

---
 .../settings/tabs/room/SecurityRoomSettingsTab-test.tsx    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/test/components/views/settings/tabs/room/SecurityRoomSettingsTab-test.tsx b/test/components/views/settings/tabs/room/SecurityRoomSettingsTab-test.tsx
index a7a7f830f3e..2595a8f362e 100644
--- a/test/components/views/settings/tabs/room/SecurityRoomSettingsTab-test.tsx
+++ b/test/components/views/settings/tabs/room/SecurityRoomSettingsTab-test.tsx
@@ -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 { clearAllModals, flushPromises, getMockClientWithEventEmitter, mockClientMethodsUser } from "../../../../../test-utils";
+import {
+    clearAllModals,
+    flushPromises,
+    getMockClientWithEventEmitter,
+    mockClientMethodsUser,
+} from "../../../../../test-utils";
 import { filterBoolean } from "../../../../../../src/utils/arrays";
 
 describe("<SecurityRoomSettingsTab />", () => {