-
-
Notifications
You must be signed in to change notification settings - Fork 2.1k
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
Use EditInPlace control for Identity Server picker to improve a11y #29280
Merged
Merged
Changes from 12 commits
Commits
Show all changes
18 commits
Select commit
Hold shift + click to select a range
3a0cffe
Use EditInPlace for identity server picker.
Half-Shot 02ffc77
Exclude picker from default dialog button styles.
Half-Shot 35700c6
Remove unused import.
Half-Shot 574b6db
Update test
Half-Shot 3f39189
Remove unused css
Half-Shot 48e3445
Update test
Half-Shot a2c411d
drop only
Half-Shot 29647c9
Add a test for setting an ID server.
Half-Shot 05b7812
Merge branch 'develop' into hs/identity-server-picker-modernize
Half-Shot 24a0453
Add a unit test for SetIdServer
Half-Shot 73d382d
fix tests
Half-Shot 397b792
Reformat mx_Dialog button :not list to use a more readable selector.
Half-Shot 5ed4e10
Reformat other :not sections
Half-Shot 84e698e
forgot a comma
Half-Shot 1fa1048
We're in 2025 now.
Half-Shot 80e5cfa
Update copyright + use class methods.
Half-Shot 0c4655c
Merge branch 'develop' into hs/identity-server-picker-modernize
Half-Shot ab4fdeb
Merge branch 'develop' into hs/identity-server-picker-modernize
Half-Shot 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
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 was deleted.
Oops, something went wrong.
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
102 changes: 102 additions & 0 deletions
102
test/unit-tests/components/views/settings/SetIdServer-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,102 @@ | ||
| /* | ||
| Copyright 2024 New Vector Ltd. | ||
| Copyright 2023 The Matrix.org Foundation C.I.C. | ||
Half-Shot marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| 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 { render, waitFor } from "jest-matrix-react"; | ||
| import userEvent from "@testing-library/user-event"; | ||
| import fetchMock from "fetch-mock-jest"; | ||
|
|
||
| import SetIdServer from "../../../../../src/components/views/settings/SetIdServer"; | ||
| import MatrixClientContext from "../../../../../src/contexts/MatrixClientContext"; | ||
| import { getMockClientWithEventEmitter, mockClientMethodsUser, mockClientMethodsServer } from "../../../../test-utils"; | ||
|
|
||
| describe("<SetIdServer />", () => { | ||
| const userId = "@alice:server.org"; | ||
|
|
||
| const mockClient = getMockClientWithEventEmitter({ | ||
| ...mockClientMethodsUser(userId), | ||
| ...mockClientMethodsServer(), | ||
| getOpenIdToken: jest.fn().mockResolvedValue("a_token"), | ||
| getTerms: jest.fn(), | ||
| setAccountData: jest.fn(), | ||
| }); | ||
|
|
||
| const getComponent = () => ( | ||
| <MatrixClientContext.Provider value={mockClient}> | ||
| <SetIdServer missingTerms={false} /> | ||
| </MatrixClientContext.Provider> | ||
| ); | ||
|
|
||
| afterAll(() => { | ||
| jest.resetAllMocks(); | ||
| }); | ||
|
|
||
| it("renders expected fields", () => { | ||
| const { asFragment } = render(getComponent()); | ||
| expect(asFragment()).toMatchSnapshot(); | ||
| }); | ||
|
|
||
| it("should allow setting an identity server", async () => { | ||
| const { getByLabelText, getByRole } = render(getComponent()); | ||
|
|
||
| fetchMock.get("https://identity.example.org/_matrix/identity/v2", { | ||
| body: {}, | ||
| }); | ||
| fetchMock.get("https://identity.example.org/_matrix/identity/v2/account", { | ||
| body: { user_id: userId }, | ||
| }); | ||
| fetchMock.post("https://identity.example.org/_matrix/identity/v2/account/register", { | ||
| body: { token: "foobar" }, | ||
| }); | ||
|
|
||
| const identServerField = getByLabelText("Enter a new identity server"); | ||
| await userEvent.type(identServerField, "https://identity.example.org"); | ||
| await userEvent.click(getByRole("button", { name: "Change" })); | ||
| await userEvent.click(getByRole("button", { name: "Continue" })); | ||
| }); | ||
|
|
||
| it("should clear input on cancel", async () => { | ||
| const { getByLabelText, getByRole } = render(getComponent()); | ||
| const identServerField = getByLabelText("Enter a new identity server"); | ||
| await userEvent.type(identServerField, "https://identity.example.org"); | ||
| await userEvent.click(getByRole("button", { name: "Reset" })); | ||
| expect((identServerField as HTMLInputElement).value).toEqual(""); | ||
| }); | ||
|
|
||
| it("should show error when an error occurs", async () => { | ||
| const { getByLabelText, getByRole, getByText } = render(getComponent()); | ||
|
|
||
| fetchMock.get("https://invalid.example.org/_matrix/identity/v2", { | ||
| body: {}, | ||
| status: 404, | ||
| }); | ||
| fetchMock.get("https://invalid.example.org/_matrix/identity/v2/account", { | ||
| body: {}, | ||
| status: 404, | ||
| }); | ||
| fetchMock.post("https://invalid.example.org/_matrix/identity/v2/account/register", { | ||
| body: {}, | ||
| status: 404, | ||
| }); | ||
|
|
||
| const identServerField = getByLabelText("Enter a new identity server"); | ||
| await userEvent.type(identServerField, "https://invalid.example.org"); | ||
| await userEvent.click(getByRole("button", { name: "Change" })); | ||
|
|
||
| await waitFor( | ||
| () => { | ||
| expect(getByText("Not a valid identity server (status code 404)")).toBeVisible(); | ||
| }, | ||
| { timeout: 3000 }, | ||
| ); | ||
|
|
||
| // Check the error vanishes when the input is edited. | ||
| await userEvent.type(identServerField, "https://identity2.example.org"); | ||
| expect(() => getByText("Not a valid identity server (status code 404)")).toThrow(); | ||
| }); | ||
| }); | ||
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.
Browser support for this is now okay https://developer.mozilla.org/en-US/docs/Web/CSS/:not#browser_compatibility.
I caused a bug here, and it was borderline unreadable before, having a list of selectors like this makes this a bit easier to parse.