-
-
Notifications
You must be signed in to change notification settings - Fork 2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Rework UrlPreviewSettings
to use MatrixClient.CryptoApi.isEncryptionEnabledInRoom
#28463
Open
florianduros
wants to merge
1
commit into
develop
Choose a base branch
from
florianduros/rip-out-legacy-crypto/migrate-urlpreviewsettings
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+405
−87
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
82 changes: 82 additions & 0 deletions
82
test/unit-tests/components/views/room_settings/UrlPreviewSettings-test.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,82 @@ | ||
/* | ||
* Copyright 2024 New Vector Ltd. | ||
* | ||
* SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only | ||
* Please see LICENSE files in the repository root for full details. | ||
*/ | ||
|
||
import React from "react"; | ||
import { MatrixClient, Room } from "matrix-js-sdk/src/matrix"; | ||
import { render, screen } from "jest-matrix-react"; | ||
import { waitFor } from "@testing-library/dom"; | ||
|
||
import { createTestClient, mkStubRoom, withClientContextRenderOptions } from "../../../../test-utils"; | ||
import { UrlPreviewSettings } from "../../../../../src/components/views/room_settings/UrlPreviewSettings.tsx"; | ||
import SettingsStore from "../../../../../src/settings/SettingsStore.ts"; | ||
import dis from "../../../../../src/dispatcher/dispatcher.ts"; | ||
import { Action } from "../../../../../src/dispatcher/actions.ts"; | ||
|
||
describe("UrlPreviewSettings", () => { | ||
let client: MatrixClient; | ||
let room: Room; | ||
|
||
beforeEach(() => { | ||
client = createTestClient(); | ||
room = mkStubRoom("roomId", "room", client); | ||
}); | ||
|
||
afterEach(() => { | ||
jest.restoreAllMocks(); | ||
}); | ||
|
||
function renderComponent() { | ||
return render(<UrlPreviewSettings room={room} />, withClientContextRenderOptions(client)); | ||
} | ||
|
||
it("should display the correct preview when the room is encrypted and the url preview is enabled", async () => { | ||
jest.spyOn(client.getCrypto()!, "isEncryptionEnabledInRoom").mockResolvedValue(true); | ||
jest.spyOn(SettingsStore, "getValue").mockReturnValue(true); | ||
|
||
const { asFragment } = renderComponent(); | ||
await waitFor(() => { | ||
expect( | ||
screen.getByText( | ||
"In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.", | ||
), | ||
).toBeInTheDocument(); | ||
}); | ||
expect(asFragment()).toMatchSnapshot(); | ||
}); | ||
|
||
it("should display the correct preview when the room is unencrypted and the url preview is enabled", async () => { | ||
jest.spyOn(client.getCrypto()!, "isEncryptionEnabledInRoom").mockResolvedValue(false); | ||
jest.spyOn(SettingsStore, "getValueAt").mockReturnValue(true); | ||
jest.spyOn(dis, "fire").mockReturnValue(undefined); | ||
|
||
const { asFragment } = renderComponent(); | ||
await waitFor(() => { | ||
expect(screen.getByRole("button", { name: "enabled" })).toBeInTheDocument(); | ||
expect( | ||
screen.getByText("URL previews are enabled by default for participants in this room."), | ||
).toBeInTheDocument(); | ||
}); | ||
expect(asFragment()).toMatchSnapshot(); | ||
|
||
screen.getByRole("button", { name: "enabled" }).click(); | ||
expect(dis.fire).toHaveBeenCalledWith(Action.ViewUserSettings); | ||
}); | ||
|
||
it("should display the correct preview when the room is unencrypted and the url preview is disabled", async () => { | ||
jest.spyOn(client.getCrypto()!, "isEncryptionEnabledInRoom").mockResolvedValue(false); | ||
jest.spyOn(SettingsStore, "getValueAt").mockReturnValue(false); | ||
|
||
const { asFragment } = renderComponent(); | ||
await waitFor(() => { | ||
expect(screen.getByRole("button", { name: "disabled" })).toBeInTheDocument(); | ||
expect( | ||
screen.getByText("URL previews are disabled by default for participants in this room."), | ||
).toBeInTheDocument(); | ||
}); | ||
expect(asFragment()).toMatchSnapshot(); | ||
}); | ||
}); |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think ignoring the loading state here is not ideal, as the user may change the wrong setting if its still loading