nikrozman/element-web
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Remove obsolete checks that the server supports cross-signing (#31275)

Browse Source 
We already depend on an API version that includes cross-signing
This commit is contained in:
Hubert Chathi
2025-11-19 12:28:08 -05:00
committed by GitHub
parent dd89cee328
commit 0a46edaaff
5 changed files with 9 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
test/unit-tests/components/structures/MatrixChat-test.tsx
View File

@@ -554,8 +554,8 @@ describe("<MatrixChat />", () => {
expect(defaultDispatcher.dispatch).toHaveBeenCalledWith({ action: "client_started" }),
);
// check we get to logged in view
await waitForSyncAndLoad(loginClient, true);
// set up keys screen is rendered
expect(screen.getByText("Setting up keys")).toBeInTheDocument();
});
it("should persist device language when available", async () => {
@@ -1166,6 +1166,8 @@ describe("<MatrixChat />", () => {
// Given force_verification is on (outer describe)
// And we just logged in via OIDC (inner describe)
mocked(loginClient.getCrypto()!.userHasCrossSigningKeys).mockResolvedValue(true);
// When we load the page
getComponent({ realQueryParams });
@@ -1340,22 +1342,8 @@ describe("<MatrixChat />", () => {
expect(screen.getByRole("heading", { name: "Welcome Ernie" })).toBeInTheDocument();
});
it("should go straight to logged in view when user does not have cross signing keys and server does not support cross signing", async () => {
loginClient.doesServerSupportUnstableFeature.mockResolvedValue(false);
await getComponentAndLogin(false);
expect(loginClient.doesServerSupportUnstableFeature).toHaveBeenCalledWith(
"org.matrix.e2e_cross_signing",
);
// logged in
await screen.findByLabelText("User menu");
});
describe("when server supports cross signing and user does not have cross signing setup", () => {
beforeEach(() => {
loginClient.doesServerSupportUnstableFeature.mockResolvedValue(true);
jest.spyOn(loginClient.getCrypto()!, "userHasCrossSigningKeys").mockResolvedValue(false);
});
@@ -1400,8 +1388,6 @@ describe("<MatrixChat />", () => {
});
it("should go to setup e2e screen", async () => {
loginClient.doesServerSupportUnstableFeature.mockResolvedValue(true);
await getComponentAndLogin();
expect(loginClient.getCrypto()!.userHasCrossSigningKeys).toHaveBeenCalled();
@@ -1424,9 +1410,7 @@ describe("<MatrixChat />", () => {
expect(screen.getByText("Confirm your identity")).toBeInTheDocument();
});
it("should setup e2e when server supports cross signing", async () => {
loginClient.doesServerSupportUnstableFeature.mockResolvedValue(true);
it("should setup e2e", async () => {
await getComponentAndLogin();
expect(loginClient.getCrypto()!.userHasCrossSigningKeys).toHaveBeenCalled();
@@ -1587,8 +1571,8 @@ describe("<MatrixChat />", () => {
action: "will_start_client",
});
// logged in but waiting for sync screen
await screen.findByText("Logout");
// set up keys screen is rendered
expect(await screen.findByText("Setting up keys")).toBeInTheDocument();
});
});
});