1
0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-08-06 10:22:45 +03:00

remove references to VerificationBase (#10996)

This commit is contained in:
Richard van der Hoff
2023-06-09 16:49:44 +01:00
committed by GitHub
parent 53b42e3217
commit 47ab99f908
3 changed files with 11 additions and 12 deletions

View File

@@ -17,10 +17,10 @@ limitations under the License.
import { act, render } from "@testing-library/react";
import React from "react";
import { Mocked } from "jest-mock";
import { VerificationBase } from "matrix-js-sdk/src/crypto/verification/Base";
import {
EmojiMapping,
ShowSasCallbacks,
Verifier,
VerifierEvent,
VerifierEventHandlerMap,
} from "matrix-js-sdk/src/crypto-api/verification";
@@ -58,16 +58,16 @@ describe("IncomingSasDialog", () => {
});
});
function renderComponent(verifier: VerificationBase, onFinished = () => true) {
function renderComponent(verifier: Verifier, onFinished = () => true) {
return render(<IncomingSasDialog verifier={verifier} onFinished={onFinished} />);
}
function makeMockVerifier(): Mocked<VerificationBase> {
function makeMockVerifier(): Mocked<Verifier> {
const verifier = new TypedEventEmitter<VerifierEvent, VerifierEventHandlerMap>();
Object.assign(verifier, {
cancel: jest.fn(),
});
return verifier as unknown as Mocked<VerificationBase>;
return verifier as unknown as Mocked<Verifier>;
}
function makeMockSasCallbacks(): ShowSasCallbacks {

View File

@@ -24,10 +24,10 @@ import {
import { TypedEventEmitter } from "matrix-js-sdk/src/models/typed-event-emitter";
import { User } from "matrix-js-sdk/src/models/user";
import { Mocked } from "jest-mock";
import { VerificationBase } from "matrix-js-sdk/src/crypto/verification/Base";
import {
EmojiMapping,
ShowSasCallbacks,
Verifier,
VerifierEvent,
VerifierEventHandlerMap,
} from "matrix-js-sdk/src/crypto-api/verification";
@@ -94,13 +94,13 @@ describe("<VerificationPanel />", () => {
});
describe("'Verify by emoji' flow", () => {
let mockVerifier: Mocked<VerificationBase>;
let mockVerifier: Mocked<Verifier>;
let mockRequest: Mocked<VerificationRequest>;
beforeEach(() => {
mockVerifier = makeMockVerifier();
mockRequest = makeMockVerificationRequest({
verifier: mockVerifier,
verifier: mockVerifier as unknown as VerificationRequest["verifier"],
chosenMethod: "m.sas.v1",
});
});
@@ -158,7 +158,7 @@ function makeMockVerificationRequest(props: Partial<VerificationRequest> = {}):
return request as unknown as Mocked<VerificationRequest>;
}
function makeMockVerifier(): Mocked<VerificationBase> {
function makeMockVerifier(): Mocked<Verifier> {
const verifier = new TypedEventEmitter<VerifierEvent, VerifierEventHandlerMap>();
Object.assign(verifier, {
cancel: jest.fn(),
@@ -166,7 +166,7 @@ function makeMockVerifier(): Mocked<VerificationBase> {
getShowSasCallbacks: jest.fn(),
getReciprocateQrCodeCallbacks: jest.fn(),
});
return verifier as unknown as Mocked<VerificationBase>;
return verifier as unknown as Mocked<Verifier>;
}
function makeMockSasCallbacks(): ShowSasCallbacks {