sorb/ThreadNet-Web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

Refactor MKeyVerificationRequest to shared view MVVM (#33461)

Browse Source 
* Refactor key verification request to shared view

* Fix prettier

* add tests to pass coverage
This commit is contained in:
Zack
2026-05-11 11:36:07 +00:00
committed by GitHub
parent 7af8beea40
commit c62acc6634
16 changed files with 699 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/web/test/unit-tests/components/views/messages/MKeyVerificationRequest-test.tsx
-116
View File
@@ -1,116 +0,0 @@
/*
Copyright 2024 New Vector Ltd.
Copyright 2022 The Matrix.org Foundation C.I.C.
SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
Please see LICENSE files in the repository root for full details.
*/
import React from "react";
import { type RenderResult, render } from "jest-matrix-react";
import { type MatrixClient, MatrixEvent } from "matrix-js-sdk/src/matrix";
import MKeyVerificationRequest from "../../../../../src/components/views/messages/MKeyVerificationRequest";
import MatrixClientContext from "../../../../../src/contexts/MatrixClientContext";
import { filterConsole } from "../../../../test-utils";
describe("MKeyVerificationRequest", () => {
filterConsole(
"The above error occurred in the <MKeyVerificationRequest> component",
"Error: Attempting to render verification request without a client context!",
"Error: Verification request did not include a sender!",
"Error: Verification request did not include a room ID!",
);
it("shows an error if not wrapped in a client context", () => {
const event = new MatrixEvent({ type: "m.key.verification.request" });
const { container } = renderEventNoClient(event);
expect(container).toHaveTextContent("Can't load this message");
});
it("shows an error if the event has no sender", () => {
const { client } = setup();
const event = new MatrixEvent({ type: "m.key.verification.request" });
const { container } = renderEvent(client, event);
expect(container).toHaveTextContent("Can't load this message");
});
it("shows an error if the event has no room", () => {
const { client } = setup();
const event = new MatrixEvent({ type: "m.key.verification.request", sender: "@a:b.co" });
const { container } = renderEvent(client, event);
expect(container).toHaveTextContent("Can't load this message");
});
it("displays a request from me", () => {
const { client, myUserId } = setup();
const event = new MatrixEvent({ type: "m.key.verification.request", sender: myUserId, room_id: "!x:y.co" });
const { container } = renderEvent(client, event);
expect(container).toHaveTextContent("You sent a verification request");
});
it("displays a request from someone else to me", () => {
const otherUserId = "@other:s.uk";
const { client } = setup();
const event = new MatrixEvent({ type: "m.key.verification.request", sender: otherUserId, room_id: "!x:y.co" });
const { container } = renderEvent(client, event);
expect(container).toHaveTextContent("other:s.uk wants to verify");
});
});
interface TestTileErrorBoundaryProps {
children: React.ReactNode;
}
interface TestTileErrorBoundaryState {
error?: Error;
}
class TestTileErrorBoundary extends React.Component<TestTileErrorBoundaryProps, TestTileErrorBoundaryState> {
public constructor(props: TestTileErrorBoundaryProps) {
super(props);
this.state = {};
}
public static getDerivedStateFromError(error: Error): Partial<TestTileErrorBoundaryState> {
return { error };
}
public render(): React.ReactNode {
if (this.state.error) {
return "Can't load this message";
}
return this.props.children;
}
}
function renderEventNoClient(event: MatrixEvent): RenderResult {
return render(
<TestTileErrorBoundary>
<MKeyVerificationRequest mxEvent={event} />
</TestTileErrorBoundary>,
);
}
function renderEvent(client: MatrixClient, event: MatrixEvent): RenderResult {
return render(
<TestTileErrorBoundary>
<MatrixClientContext.Provider value={client}>
<MKeyVerificationRequest mxEvent={event} />
</MatrixClientContext.Provider>
,
</TestTileErrorBoundary>,
);
}
function setup(): { client: MatrixClient; myUserId: string } {
const myUserId = "@me:s.co";
const client = {
getSafeUserId: jest.fn().mockReturnValue(myUserId),
getRoom: jest.fn(),
} as unknown as MatrixClient;
return { client, myUserId };
}