imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add MatrixClientPeg::safeGet and use it in tests (#10985)

Browse source
This commit is contained in:
Michael Telatynski 2023-06-05 18:12:23 +01:00 • committed by GitHub
parent c47b587225
commit 6b46d6e4f8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
88 changed files with 290 additions and 226 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/components/views/settings/CryptographyPanel-test.tsx
View file

@ -29,7 +29,7 @@ describe("CryptographyPanel", () => {
const sessionKeyFormatted = "<b>AbCD eFgh IJK7 L/m4 nOPq RSTU VW4x yzaB CDef 6gHI Jkl</b>";
TestUtils.stubClient();
const client: MatrixClient = MatrixClientPeg.get();
const client: MatrixClient = MatrixClientPeg.safeGet();
client.deviceId = sessionId;
client.getDeviceEd25519Key = () => sessionKey;

2
test/components/views/settings/tabs/room/AdvancedRoomSettingsTab-test.tsx
View file

@ -41,7 +41,7 @@ describe("AdvancedRoomSettingsTab", () => {
beforeEach(() => {
stubClient();
cli = MatrixClientPeg.get();
cli = MatrixClientPeg.safeGet();
room = mkStubRoom(roomId, "test room", cli);
mocked(cli.getRoom).mockReturnValue(room);
mocked(dis.dispatch).mockReset();

2
test/components/views/settings/tabs/room/NotificationSettingsTab-test.tsx
View file

@ -38,7 +38,7 @@ describe("NotificatinSettingsTab", () => {
beforeEach(() => {
stubClient();
cli = MatrixClientPeg.get();
cli = MatrixClientPeg.safeGet();
const room = mkStubRoom(roomId, "test room", cli);
roomProps = EchoChamber.forRoom(room);

2
test/components/views/settings/tabs/room/RolesRoomSettingsTab-test.tsx
View file

@ -50,7 +50,7 @@ describe("RolesRoomSettingsTab", () => {
beforeEach(() => {
stubClient();
cli = MatrixClientPeg.get();
cli = MatrixClientPeg.safeGet();
room = mkStubRoom(roomId, "test room", cli);
});

2
test/components/views/settings/tabs/room/VoipRoomSettingsTab-test.tsx
View file

@ -38,7 +38,7 @@ describe("VoipRoomSettingsTab", () => {
beforeEach(() => {
stubClient();
cli = MatrixClientPeg.get();
cli = MatrixClientPeg.safeGet();
room = mkStubRoom(roomId, "test room", cli);
jest.spyOn(cli, "sendStateEvent");

2
test/components/views/settings/tabs/user/PreferencesUserSettingsTab-test.tsx
View file

@ -53,7 +53,7 @@ describe("PreferencesUserSettingsTab", () => {
const getToggle = () => renderTab().getByRole("switch", { name: "Send read receipts" });
const mockIsVersionSupported = (val: boolean) => {
const client = MatrixClientPeg.get();
const client = MatrixClientPeg.safeGet();
jest.spyOn(client, "doesServerSupportUnstableFeature").mockResolvedValue(false);
jest.spyOn(client, "isVersionSupported").mockImplementation(async (version: string) => {
if (version === "v1.4") return val;