PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Fix server picker not allowing you to switch from custom to default (#11127)

Browse source
This commit is contained in:
Michael Telatynski 2023-06-22 14:48:15 +01:00 committed by GitHub
parent 0b77c060ea
commit d935da2844
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/components/views/dialogs/ServerPickerDialog.tsx
View file

@ -159,6 +159,7 @@ export default class ServerPickerDialog extends React.PureComponent<IProps, ISta
if (this.state.defaultChosen) {
this.props.onFinished(this.defaultServer);
return;
}
const valid = await this.fieldRef.current?.validate({ allowEmpty: false });
@ -173,7 +174,7 @@ export default class ServerPickerDialog extends React.PureComponent<IProps, ISta
};
public render(): React.ReactNode {
let text;
let text: string | undefined;
if (this.defaultServer.hsName === "matrix.org") {
text = _t("Matrix.org is the biggest public homeserver in the world, so it's a good place for many.");
}

29
test/components/views/dialogs/ServerPickerDialog-test.tsx
View file

@ -114,6 +114,35 @@ describe("<ServerPickerDialog />", () => {
expect(onFinished).toHaveBeenCalledWith(defaultServerConfig);
});
it("should allow user to revert from a custom server to the default", async () => {
fetchMock.get(`https://custom.org/_matrix/client/versions`, {
unstable_features: {},
versions: [],
});
const onFinished = jest.fn();
const serverConfig = {
hsUrl: "https://custom.org",
hsName: "custom.org",
hsNameIsDifferent: true,
isUrl: "https://is.org",
isDefault: false,
isNameResolvable: true,
warning: "",
};
getComponent({ onFinished, serverConfig });
fireEvent.click(screen.getByTestId("defaultHomeserver"));
expect(screen.getByTestId("defaultHomeserver")).toBeChecked();
fireEvent.click(screen.getByText("Continue"));
await flushPromises();
// closed dialog with default server and nothing else
expect(onFinished).toHaveBeenCalledWith(defaultServerConfig);
expect(onFinished).toHaveBeenCalledTimes(1);
});
it("should submit successfully with a valid custom homeserver", async () => {
const homeserver = "https://myhomeserver.site";
fetchMock.get(`${homeserver}/_matrix/client/versions`, {