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

Avoid using deprecated exports, fields, and duplicate code (#12555)

Browse source
This commit is contained in:
Michael Telatynski 2024-05-28 08:41:20 +01:00 • committed by GitHub
parent 1973197eb6
commit 148a360598
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
33 changed files with 258 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/components/views/dialogs/SpotlightDialog-test.tsx
View file

@ -82,8 +82,8 @@ function mockClient({
}: MockClientOptions = {}): MatrixClient {
stubClient();
const cli = MatrixClientPeg.safeGet();
MatrixClientPeg.getHomeserverName = jest.fn(() => homeserver);
cli.getUserId = jest.fn(() => userId);
cli.getDomain = jest.fn(() => homeserver);
cli.getHomeserverUrl = jest.fn(() => homeserver);
cli.getThirdpartyProtocols = jest.fn(() => Promise.resolve(thirdPartyProtocols));
cli.publicRooms = jest.fn((options) => {

4
test/components/views/dialogs/security/CreateSecretStorageDialog-test.tsx
View file

@ -18,7 +18,7 @@ import { render, RenderResult, screen } from "@testing-library/react";
import userEvent from "@testing-library/user-event";
import React from "react";
import { mocked, MockedObject } from "jest-mock";
import { CryptoApi, MatrixClient, MatrixError } from "matrix-js-sdk/src/matrix";
import { Crypto, MatrixClient, MatrixError } from "matrix-js-sdk/src/matrix";
import { defer, IDeferred, sleep } from "matrix-js-sdk/src/utils";
import { BackupTrustInfo, KeyBackupInfo } from "matrix-js-sdk/src/crypto-api";
@ -35,7 +35,7 @@ import RestoreKeyBackupDialog from "../../../../../src/components/views/dialogs/
describe("CreateSecretStorageDialog", () => {
let mockClient: MockedObject<MatrixClient>;
let mockCrypto: MockedObject<CryptoApi>;
let mockCrypto: MockedObject<Crypto.CryptoApi>;
beforeEach(() => {
mockClient = getMockClientWithEventEmitter({

4
test/components/views/dialogs/security/ExportE2eKeysDialog-test.tsx
View file

@ -17,7 +17,7 @@ limitations under the License.
import React from "react";
import { screen, fireEvent, render, waitFor } from "@testing-library/react";
import userEvent from "@testing-library/user-event";
import { CryptoApi, IMegolmSessionData } from "matrix-js-sdk/src/matrix";
import { Crypto, IMegolmSessionData } from "matrix-js-sdk/src/matrix";
import * as MegolmExportEncryption from "../../../../../src/utils/MegolmExportEncryption";
import ExportE2eKeysDialog from "../../../../../src/async-components/views/dialogs/security/ExportE2eKeysDialog";
@ -70,7 +70,7 @@ describe("ExportE2eKeysDialog", () => {
cli.getCrypto = () => {
return {
exportRoomKeysAsJson,
} as unknown as CryptoApi;
} as unknown as Crypto.CryptoApi;
};
// Mock the result of encrypting the sessions. If we don't do this, the

4
test/components/views/dialogs/security/ImportE2eKeysDialog-test.tsx
View file

@ -17,7 +17,7 @@ limitations under the License.
import React from "react";
import { fireEvent, render, waitFor } from "@testing-library/react";
import userEvent from "@testing-library/user-event";
import { CryptoApi } from "matrix-js-sdk/src/matrix";
import { Crypto } from "matrix-js-sdk/src/matrix";
import ImportE2eKeysDialog from "../../../../../src/async-components/views/dialogs/security/ImportE2eKeysDialog";
import * as MegolmExportEncryption from "../../../../../src/utils/MegolmExportEncryption";
@ -75,7 +75,7 @@ describe("ImportE2eKeysDialog", () => {
cli.getCrypto = () => {
return {
importRoomKeysAsJson,
} as unknown as CryptoApi;
} as unknown as Crypto.CryptoApi;
};
// Mock the result of decrypting the sessions, to avoid needing to