matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-08-09 08:42:50 +03:00
Code Activity

Support Matrix 1.1 (drop legacy r0 versions) (#9819)

Browse Source 
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Travis Ralston
2023-08-14 02:25:13 -06:00
committed by GitHub
parent f9e79fd5d6
commit 180fcaa70f
32 changed files with 712 additions and 440 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/components/structures/MatrixChat-test.tsx
View File

@@ -59,6 +59,7 @@ describe("<MatrixChat />", () => {
// reused in createClient mock below
const getMockClientMethods = () => ({
...mockClientMethodsUser(userId),
getVersions: jest.fn().mockResolvedValue({ versions: ["v1.1"] }),
startClient: jest.fn(),
stopClient: jest.fn(),
setCanResetTimelineCallback: jest.fn(),
@@ -178,7 +179,7 @@ describe("<MatrixChat />", () => {
mockClient = getMockClientWithEventEmitter(getMockClientMethods());
fetchMock.get("https://test.com/_matrix/client/versions", {
unstable_features: {},
versions: [],
versions: ["v1.1"],
});
localStorageSetSpy = jest.spyOn(localStorage.__proto__, "setItem");
localStorageGetSpy = jest.spyOn(localStorage.__proto__, "getItem").mockReturnValue(undefined);

6
test/components/structures/auth/Login-test.tsx
View File

@@ -71,7 +71,7 @@ describe("Login", function () {
fetchMock.resetHistory();
fetchMock.get("https://matrix.org/_matrix/client/versions", {
unstable_features: {},
versions: [],
versions: ["v1.1"],
});
platform = mockPlatformPeg({
startSingleSignOn: jest.fn(),
@@ -209,7 +209,7 @@ describe("Login", function () {
fetchMock.get("https://server2/_matrix/client/versions", {
unstable_features: {},
versions: [],
versions: ["v1.1"],
});
rerender(getRawComponent("https://server2"));
await waitForElementToBeRemoved(() => screen.queryAllByLabelText("Loading…"));
@@ -359,7 +359,7 @@ describe("Login", function () {
// but server2 is
fetchMock.get("https://server2/_matrix/client/versions", {
unstable_features: {},
versions: [],
versions: ["v1.1"],
});
const { rerender } = render(getRawComponent());
await waitForElementToBeRemoved(() => screen.queryAllByLabelText("Loading…"));

5
test/components/structures/auth/Registration-test.tsx
View File

@@ -36,6 +36,7 @@ describe("Registration", function () {
const mockClient = mocked({
registerRequest,
loginFlows: jest.fn(),
getVersions: jest.fn().mockResolvedValue({ versions: ["v1.1"] }),
} as unknown as MatrixClient);
beforeEach(function () {
@@ -59,7 +60,7 @@ describe("Registration", function () {
});
fetchMock.get("https://matrix.org/_matrix/client/versions", {
unstable_features: {},
versions: [],
versions: ["v1.1"],
});
mockPlatformPeg({
startSingleSignOn: jest.fn(),
@@ -125,7 +126,7 @@ describe("Registration", function () {
fetchMock.get("https://server2/_matrix/client/versions", {
unstable_features: {},
versions: [],
versions: ["v1.1"],
});
rerender(getRawComponent("https://server2"));
await waitForElementToBeRemoved(() => screen.queryAllByLabelText("Loading…"));

8
test/components/views/dialogs/ServerPickerDialog-test.tsx
View File

@@ -112,7 +112,7 @@ describe("<ServerPickerDialog />", () => {
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: [],
versions: ["v1.1"],
});
const onFinished = jest.fn();
@@ -142,7 +142,7 @@ describe("<ServerPickerDialog />", () => {
const homeserver = "https://myhomeserver.site";
fetchMock.get(`${homeserver}/_matrix/client/versions`, {
unstable_features: {},
versions: [],
versions: ["v1.1"],
});
const onFinished = jest.fn();
getComponent({ onFinished });
@@ -195,7 +195,7 @@ describe("<ServerPickerDialog />", () => {
fetchMock.getOnce(wellKnownUrl, validWellKnown);
fetchMock.getOnce(versionsUrl, {
versions: [],
versions: ["v1.1"],
});
fetchMock.getOnce(isWellKnownUrl, {});
const onFinished = jest.fn();
@@ -231,7 +231,7 @@ describe("<ServerPickerDialog />", () => {
const wellKnownUrl = `https://${homeserver}/.well-known/matrix/client`;
fetchMock.get(wellKnownUrl, { status: 404 });
// but is otherwise live (happy versions response)
fetchMock.get(`https://${homeserver}/_matrix/client/versions`, { versions: ["1"] });
fetchMock.get(`https://${homeserver}/_matrix/client/versions`, { versions: ["v1.1"] });
const onFinished = jest.fn();
getComponent({ onFinished });

8
test/components/views/messages/MImageBody-test.tsx
View File

@@ -56,7 +56,7 @@ describe("<MImageBody/>", () => {
},
}),
});
const url = "https://server/_matrix/media/r0/download/server/encrypted-image";
const url = "https://server/_matrix/media/v3/download/server/encrypted-image";
// eslint-disable-next-line no-restricted-properties
cli.mxcUrlToHttp.mockImplementation(
(mxcUrl: string, width?: number, height?: number, resizeMethod?: string, allowDirectLinks?: boolean) => {
@@ -179,8 +179,8 @@ describe("<MImageBody/>", () => {
});
it("should fall back to /download/ if /thumbnail/ fails", async () => {
const thumbUrl = "https://server/_matrix/media/r0/thumbnail/server/image?width=800&height=600&method=scale";
const downloadUrl = "https://server/_matrix/media/r0/download/server/image";
const thumbUrl = "https://server/_matrix/media/v3/thumbnail/server/image?width=800&height=600&method=scale";
const downloadUrl = "https://server/_matrix/media/v3/download/server/image";
const event = new MatrixEvent({
room_id: "!room:server",
@@ -227,7 +227,7 @@ describe("<MImageBody/>", () => {
mocked(global.URL.createObjectURL).mockReturnValue("blob:generated-thumb");
fetchMock.getOnce(
"https://server/_matrix/media/r0/download/server/image",
"https://server/_matrix/media/v3/download/server/image",
{
body: fs.readFileSync(path.resolve(__dirname, "..", "..", "..", "images", "animated-logo.webp")),
},

2
test/components/views/messages/MVideoBody-test.tsx
View File

@@ -57,7 +57,7 @@ describe("MVideoBody", () => {
},
}),
});
const thumbUrl = "https://server/_matrix/media/r0/download/server/encrypted-poster";
const thumbUrl = "https://server/_matrix/media/v3/download/server/encrypted-poster";
fetchMock.getOnce(thumbUrl, { status: 200 });
// eslint-disable-next-line no-restricted-properties

2
test/components/views/messages/__snapshots__/MImageBody-test.tsx.snap
View File

@@ -6,7 +6,7 @@ exports[`<MImageBody/> should generate a thumbnail if one isn't included for ani
class="mx_MImageBody"
>
<a
href="https://server/_matrix/media/r0/download/server/image"
href="https://server/_matrix/media/v3/download/server/image"
>
<div
class="mx_MImageBody_thumbnail_container"

2
test/components/views/messages/__snapshots__/MVideoBody-test.tsx.snap
View File

@@ -37,7 +37,7 @@ exports[`MVideoBody should show poster for encrypted media before downloading it
class="mx_MVideoBody"
controls=""
controlslist="nodownload"
poster="https://server/_matrix/media/r0/download/server/encrypted-poster"
poster="https://server/_matrix/media/v3/download/server/encrypted-poster"
preload="none"
title="alt for a test video"
/>

86
test/components/views/settings/ChangePassword-test.tsx Normal file
View File

@@ -0,0 +1,86 @@
/*
Copyright 2023 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
import React from "react";
import { render, screen, waitFor } from "@testing-library/react";
import userEvent from "@testing-library/user-event";
import { mocked } from "jest-mock";
import ChangePassword from "../../../../src/components/views/settings/ChangePassword";
import { stubClient } from "../../../test-utils";
describe("<ChangePassword />", () => {
it("renders expected fields", () => {
const onFinished = jest.fn();
const onError = jest.fn();
const { asFragment } = render(<ChangePassword onFinished={onFinished} onError={onError} />);
expect(asFragment()).toMatchSnapshot();
});
it("should show validation tooltip if passwords do not match", async () => {
const onFinished = jest.fn();
const onError = jest.fn();
const { getByLabelText, getByText } = render(<ChangePassword onFinished={onFinished} onError={onError} />);
const currentPasswordField = getByLabelText("Current password");
await userEvent.type(currentPasswordField, "CurrentPassword1234");
const newPasswordField = getByLabelText("New Password");
await userEvent.type(newPasswordField, "$%newPassword1234");
const confirmPasswordField = getByLabelText("Confirm password");
await userEvent.type(confirmPasswordField, "$%newPassword1235");
await userEvent.click(getByText("Change Password"));
await expect(screen.findByText("Passwords don't match")).resolves.toBeInTheDocument();
});
it("should call MatrixClient::setPassword with expected parameters", async () => {
const cli = stubClient();
mocked(cli.setPassword).mockResolvedValue({});
const onFinished = jest.fn();
const onError = jest.fn();
const { getByLabelText, getByText } = render(<ChangePassword onFinished={onFinished} onError={onError} />);
const currentPasswordField = getByLabelText("Current password");
await userEvent.type(currentPasswordField, "CurrentPassword1234");
const newPasswordField = getByLabelText("New Password");
await userEvent.type(newPasswordField, "$%newPassword1234");
const confirmPasswordField = getByLabelText("Confirm password");
await userEvent.type(confirmPasswordField, "$%newPassword1234");
await userEvent.click(getByText("Change Password"));
await waitFor(() => {
expect(cli.setPassword).toHaveBeenCalledWith(
expect.objectContaining({
type: "m.login.password",
identifier: {
type: "m.id.user",
user: cli.getUserId(),
},
password: "CurrentPassword1234",
}),
"$%newPassword1234",
false,
);
});
expect(onFinished).toHaveBeenCalled();
});
});

71
test/components/views/settings/__snapshots__/ChangePassword-test.tsx.snap Normal file
View File

@@ -0,0 +1,71 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`<ChangePassword /> renders expected fields 1`] = `
<DocumentFragment>
<form>
<div>
<div
class="mx_Field mx_Field_input"
>
<input
id="mx_Field_1"
label="Current password"
placeholder="Current password"
type="password"
value=""
/>
<label
for="mx_Field_1"
>
Current password
</label>
</div>
</div>
<div>
<div
class="mx_Field mx_Field_input mx_PassphraseField"
>
<input
autocomplete="new-password"
id="mx_Field_2"
label="New Password"
placeholder="New Password"
type="password"
value=""
/>
<label
for="mx_Field_2"
>
New Password
</label>
</div>
</div>
<div>
<div
class="mx_Field mx_Field_input"
>
<input
autocomplete="new-password"
id="mx_Field_3"
label="Confirm password"
placeholder="Confirm password"
type="password"
value=""
/>
<label
for="mx_Field_3"
>
Confirm password
</label>
</div>
</div>
<div
class="mx_AccessibleButton"
role="button"
tabindex="0"
>
Change Password
</div>
</form>
</DocumentFragment>
`;

67
test/components/views/settings/account/PhoneNumbers-test.tsx Normal file
View File

@@ -0,0 +1,67 @@
/*
Copyright 2023 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
import React from "react";
import { render } from "@testing-library/react";
import userEvent from "@testing-library/user-event";
import { mocked } from "jest-mock";
import PhoneNumbers from "../../../../../src/components/views/settings/account/PhoneNumbers";
import { stubClient } from "../../../../test-utils";
import SdkConfig from "../../../../../src/SdkConfig";
describe("<PhoneNumbers />", () => {
it("should allow a phone number to be added", async () => {
SdkConfig.add({
default_country_code: "GB",
});
const cli = stubClient();
const onMsisdnsChange = jest.fn();
const { asFragment, getByLabelText, getByText } = render(
<PhoneNumbers msisdns={[]} onMsisdnsChange={onMsisdnsChange} />,
);
mocked(cli.requestAdd3pidMsisdnToken).mockResolvedValue({
sid: "SID",
msisdn: "447900111222",
submit_url: "https://server.url",
success: true,
intl_fmt: "no-clue",
});
mocked(cli.submitMsisdnTokenOtherUrl).mockResolvedValue({ success: true });
mocked(cli.addThreePidOnly).mockResolvedValue({});
const phoneNumberField = getByLabelText("Phone Number");
await userEvent.type(phoneNumberField, "7900111222");
await userEvent.click(getByText("Add"));
expect(cli.requestAdd3pidMsisdnToken).toHaveBeenCalledWith("GB", "7900111222", "t35tcl1Ent5ECr3T", 1);
expect(asFragment()).toMatchSnapshot();
const verificationCodeField = getByLabelText("Verification code");
await userEvent.type(verificationCodeField, "123666");
await userEvent.click(getByText("Continue"));
expect(cli.submitMsisdnTokenOtherUrl).toHaveBeenCalledWith(
"https://server.url",
"SID",
"t35tcl1Ent5ECr3T",
"123666",
);
expect(onMsisdnsChange).toHaveBeenCalledWith([{ address: "447900111222", medium: "msisdn" }]);
});
});

110
test/components/views/settings/account/__snapshots__/PhoneNumbers-test.tsx.snap Normal file
View File

@@ -0,0 +1,110 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`<PhoneNumbers /> should allow a phone number to be added 1`] = `
<DocumentFragment>
<form
autocomplete="off"
class="mx_PhoneNumbers_new"
novalidate=""
>
<div
class="mx_PhoneNumbers_input"
>
<div
class="mx_Field mx_Field_input mx_Field_labelAlwaysTopLeft"
>
<span
class="mx_Field_prefix"
>
<div
class="mx_Dropdown mx_PhoneNumbers_country mx_CountryDropdown mx_Dropdown_disabled"
>
<div
aria-describedby="mx_CountryDropdown_value"
aria-disabled="true"
aria-expanded="false"
aria-haspopup="listbox"
aria-label="Country Dropdown"
aria-owns="mx_CountryDropdown_input"
class="mx_AccessibleButton mx_Dropdown_input mx_no_textinput mx_AccessibleButton_disabled"
disabled=""
role="button"
tabindex="0"
>
<div
class="mx_Dropdown_option"
id="mx_CountryDropdown_value"
>
<span
class="mx_CountryDropdown_shortOption"
>
<div
class="mx_Dropdown_option_emoji"
>
🇬🇧
</div>
+44
</span>
</div>
<span
class="mx_Dropdown_arrow"
/>
</div>
</div>
</span>
<input
autocomplete="tel-national"
disabled=""
id="mx_Field_1"
label="Phone Number"
placeholder="Phone Number"
type="text"
value="7900111222"
/>
<label
for="mx_Field_1"
>
Phone Number
</label>
</div>
</div>
</form>
<div>
<div>
A text message has been sent to +447900111222. Please enter the verification code it contains.
<br />
</div>
<form
autocomplete="off"
novalidate=""
>
<div
class="mx_Field mx_Field_input"
>
<input
autocomplete="off"
id="mx_Field_2"
label="Verification code"
placeholder="Verification code"
type="text"
value=""
/>
<label
for="mx_Field_2"
>
Verification code
</label>
</div>
<div
aria-disabled="true"
class="mx_AccessibleButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_primary mx_AccessibleButton_disabled"
disabled=""
role="button"
tabindex="0"
>
Continue
</div>
</form>
</div>
</DocumentFragment>
`;

3
test/components/views/settings/discovery/EmailAddresses-test.tsx
View File

@@ -42,7 +42,6 @@ describe("<EmailAddress/>", () => {
const mockClient = getMockClientWithEventEmitter({
getIdentityServerUrl: jest.fn().mockReturnValue("https://fake-identity-server"),
generateClientSecret: jest.fn(),
doesServerSupportSeparateAddAndBind: jest.fn(),
requestEmailToken: jest.fn(),
bindThreePid: jest.fn(),
});
@@ -74,7 +73,6 @@ describe("<EmailAddress/>", () => {
describe("Email verification share phase", () => {
it("shows translated error message", async () => {
render(<EmailAddress email={emailThreepidFixture} />);
mockClient.doesServerSupportSeparateAddAndBind.mockResolvedValue(true);
mockClient.requestEmailToken.mockRejectedValue(
new MatrixError(
{ errcode: "M_THREEPID_IN_USE", error: "Some fake MatrixError occured" },
@@ -94,7 +92,6 @@ describe("<EmailAddress/>", () => {
// Start these tests out at the "Complete" phase
render(<EmailAddress email={emailThreepidFixture} />);
mockClient.requestEmailToken.mockResolvedValue({ sid: "123-fake-sid" } satisfies IRequestTokenResponse);
mockClient.doesServerSupportSeparateAddAndBind.mockResolvedValue(true);
fireEvent.click(screen.getByText("Share"));
// Then wait for the completion screen to come up
await screen.findByText("Complete");

56
test/components/views/settings/discovery/PhoneNumbers-test.tsx
View File

@@ -15,38 +15,47 @@ limitations under the License.
*/
import React from "react";
import { render, screen } from "@testing-library/react";
import { fireEvent, render, screen, waitFor } from "@testing-library/react";
import { IThreepid, ThreepidMedium } from "matrix-js-sdk/src/@types/threepids";
import userEvent from "@testing-library/user-event";
import { mocked } from "jest-mock";
import PhoneNumbers, { PhoneNumber } from "../../../../../src/components/views/settings/discovery/PhoneNumbers";
import { stubClient } from "../../../../test-utils";
const msisdn: IThreepid = {
medium: ThreepidMedium.Phone,
address: "+441111111111",
address: "441111111111",
validated_at: 12345,
added_at: 12342,
bound: false,
};
describe("<PhoneNumber/>", () => {
it("should track props.msisdn.bound changes", async () => {
const { rerender } = render(<PhoneNumber msisdn={msisdn} />);
const { rerender } = render(<PhoneNumber msisdn={{ ...msisdn }} />);
await screen.findByText("Share");
msisdn.bound = true;
rerender(<PhoneNumber msisdn={{ ...msisdn }} />);
rerender(<PhoneNumber msisdn={{ ...msisdn, bound: true }} />);
await screen.findByText("Revoke");
});
});
const mockGetAccessToken = jest.fn().mockResolvedValue("$$getAccessToken");
jest.mock("../../../../../src/IdentityAuthClient", () =>
jest.fn().mockImplementation(() => ({
getAccessToken: mockGetAccessToken,
})),
);
describe("<PhoneNumbers />", () => {
it("should render a loader while loading", async () => {
const { container } = render(<PhoneNumbers msisdns={[msisdn]} isLoading={true} />);
const { container } = render(<PhoneNumbers msisdns={[{ ...msisdn }]} isLoading={true} />);
expect(container).toMatchSnapshot();
});
it("should render phone numbers", async () => {
const { container } = render(<PhoneNumbers msisdns={[msisdn]} isLoading={false} />);
const { container } = render(<PhoneNumbers msisdns={[{ ...msisdn }]} isLoading={false} />);
expect(container).toMatchSnapshot();
});
@@ -56,4 +65,37 @@ describe("<PhoneNumbers />", () => {
expect(container).toMatchSnapshot();
});
it("should allow binding msisdn", async () => {
const cli = stubClient();
const { getByText, getByLabelText, asFragment } = render(
<PhoneNumbers msisdns={[{ ...msisdn }]} isLoading={false} />,
);
mocked(cli.requestMsisdnToken).mockResolvedValue({
sid: "SID",
msisdn: "+447900111222",
submit_url: "https://server.url",
success: true,
intl_fmt: "no-clue",
});
fireEvent.click(getByText("Share"));
await waitFor(() =>
expect(cli.requestMsisdnToken).toHaveBeenCalledWith(
null,
"+441111111111",
"t35tcl1Ent5ECr3T",
1,
undefined,
"$$getAccessToken",
),
);
expect(asFragment()).toMatchSnapshot();
const verificationCodeField = getByLabelText("Verification code");
await userEvent.type(verificationCodeField, "123666{Enter}");
expect(cli.submitMsisdnToken).toHaveBeenCalledWith("SID", "t35tcl1Ent5ECr3T", "123666", "$$getAccessToken");
});
});

68
test/components/views/settings/discovery/__snapshots__/PhoneNumbers-test.tsx.snap
View File

@@ -1,5 +1,67 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`<PhoneNumbers /> should allow binding msisdn 1`] = `
<DocumentFragment>
<div
class="mx_SettingsSubsection"
data-testid="mx_DiscoveryPhoneNumbers"
>
<div
class="mx_SettingsSubsectionHeading"
>
<h3
class="mx_Heading_h4 mx_SettingsSubsectionHeading_heading"
>
Phone numbers
</h3>
</div>
<div
class="mx_SettingsSubsection_content mx_SettingsSubsection_contentStretch"
>
<div
class="mx_GeneralUserSettingsTab_section--discovery_existing"
>
<span
class="mx_GeneralUserSettingsTab_section--discovery_existing_address"
>
+441111111111
</span>
<span
class="mx_GeneralUserSettingsTab_section--discovery_existing_verification"
>
<span>
Please enter verification code sent via text.
<br />
</span>
<form
autocomplete="off"
novalidate=""
>
<div
class="mx_Field mx_Field_input"
>
<input
autocomplete="off"
id="mx_Field_1"
label="Verification code"
placeholder="Verification code"
type="text"
value=""
/>
<label
for="mx_Field_1"
>
Verification code
</label>
</div>
</form>
</span>
</div>
</div>
</div>
</DocumentFragment>
`;
exports[`<PhoneNumbers /> should handle no numbers 1`] = `
<div>
<div
@@ -85,14 +147,14 @@ exports[`<PhoneNumbers /> should render phone numbers 1`] = `
class="mx_GeneralUserSettingsTab_section--discovery_existing_address"
>
+
+441111111111
441111111111
</span>
<div
class="mx_AccessibleButton mx_GeneralUserSettingsTab_section--discovery_existing_button mx_AccessibleButton_hasKind mx_AccessibleButton_kind_danger_sm"
class="mx_AccessibleButton mx_GeneralUserSettingsTab_section--discovery_existing_button mx_AccessibleButton_hasKind mx_AccessibleButton_kind_primary_sm"
role="button"
tabindex="0"
>
Revoke
Share
</div>
</div>
</div>