Use oxlint to apply jsx/tsx extension consistently (#34303)
* Remove stale max-len disablements * Remove stale camelCase & naming-convention disablements * Remove stale ban-ts-comment disablements * Remove stale no-var disablements * Remove stale no-empty-property disablements * Remove stale react rule disablements * Remove stale no-constant-condition disablements * Remove stale no-unused-vars disablements * Remove stale disablements for disabled rules * fixup camelcase * Remove dead code * Tidy code * Tweak oxlint config * Use oxlint to apply jsx/tsx extension consistently * Fix import * Fix imports * Rename affected snapshots * Update more imports
This commit is contained in:
Michael Telatynski
@@ -1,212 +0,0 @@
|
||||
/*
|
||||
Copyright 2024 New Vector Ltd.
|
||||
Copyright 2019 The Matrix.org Foundation C.I.C.
|
||||
|
||||
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 { EventType, MatrixEvent, type Policy, SERVICE_TYPES, type Terms } from "matrix-js-sdk/src/matrix";
|
||||
import { screen, within } from "jest-matrix-react";
|
||||
|
||||
import { dialogTermsInteractionCallback, Service, startTermsFlow } from "../../src/Terms";
|
||||
import { getMockClientWithEventEmitter } from "../test-utils";
|
||||
import { MatrixClientPeg } from "../../src/MatrixClientPeg";
|
||||
|
||||
const POLICY_ONE = {
|
||||
version: "six",
|
||||
en: {
|
||||
name: "The first policy",
|
||||
url: "http://example.com/one",
|
||||
},
|
||||
} satisfies Policy;
|
||||
|
||||
const POLICY_TWO = {
|
||||
version: "IX",
|
||||
en: {
|
||||
name: "The second policy",
|
||||
url: "http://example.com/two",
|
||||
},
|
||||
} satisfies Policy;
|
||||
|
||||
const IM_SERVICE_ONE = new Service(SERVICE_TYPES.IM, "https://imone.test", "a token token");
|
||||
const IM_SERVICE_TWO = new Service(SERVICE_TYPES.IM, "https://imtwo.test", "a token token");
|
||||
|
||||
describe("Terms", function () {
|
||||
const mockClient = getMockClientWithEventEmitter({
|
||||
getAccountData: jest.fn(),
|
||||
getTerms: jest.fn(),
|
||||
agreeToTerms: jest.fn(),
|
||||
setAccountData: jest.fn(),
|
||||
});
|
||||
|
||||
beforeEach(function () {
|
||||
jest.clearAllMocks();
|
||||
mockClient.getAccountData.mockReturnValue(undefined);
|
||||
mockClient.getTerms.mockResolvedValue({ policies: {} });
|
||||
mockClient.setAccountData.mockResolvedValue({});
|
||||
});
|
||||
|
||||
afterAll(() => {
|
||||
jest.spyOn(MatrixClientPeg, "get").mockRestore();
|
||||
});
|
||||
|
||||
it("should prompt for all terms & services if no account data", async function () {
|
||||
mockClient.getAccountData.mockReturnValue(undefined);
|
||||
mockClient.getTerms.mockResolvedValue({
|
||||
policies: {
|
||||
policy_the_first: POLICY_ONE,
|
||||
},
|
||||
});
|
||||
const interactionCallback = jest.fn().mockResolvedValue([]);
|
||||
await startTermsFlow(mockClient, [IM_SERVICE_ONE], interactionCallback);
|
||||
|
||||
expect(interactionCallback).toHaveBeenCalledWith(
|
||||
[
|
||||
{
|
||||
service: IM_SERVICE_ONE,
|
||||
policies: {
|
||||
policy_the_first: POLICY_ONE,
|
||||
},
|
||||
},
|
||||
],
|
||||
[],
|
||||
);
|
||||
});
|
||||
|
||||
it("should not prompt if all policies are signed in account data", async function () {
|
||||
const directEvent = new MatrixEvent({
|
||||
type: EventType.Direct,
|
||||
content: {
|
||||
accepted: ["http://example.com/one"],
|
||||
},
|
||||
});
|
||||
mockClient.getAccountData.mockReturnValue(directEvent);
|
||||
mockClient.getTerms.mockResolvedValue({
|
||||
policies: {
|
||||
policy_the_first: POLICY_ONE,
|
||||
},
|
||||
});
|
||||
|
||||
const interactionCallback = jest.fn();
|
||||
await startTermsFlow(mockClient, [IM_SERVICE_ONE], interactionCallback);
|
||||
|
||||
expect(interactionCallback).not.toHaveBeenCalled();
|
||||
expect(mockClient.agreeToTerms).toHaveBeenCalledWith(SERVICE_TYPES.IM, "https://imone.test", "a token token", [
|
||||
"http://example.com/one",
|
||||
]);
|
||||
});
|
||||
|
||||
it("should prompt for only terms that aren't already signed", async function () {
|
||||
const directEvent = new MatrixEvent({
|
||||
type: EventType.Direct,
|
||||
content: {
|
||||
accepted: ["http://example.com/one"],
|
||||
},
|
||||
});
|
||||
mockClient.getAccountData.mockReturnValue(directEvent);
|
||||
|
||||
mockClient.getTerms.mockResolvedValue({
|
||||
policies: {
|
||||
policy_the_first: POLICY_ONE,
|
||||
policy_the_second: POLICY_TWO,
|
||||
},
|
||||
});
|
||||
|
||||
const interactionCallback = jest.fn().mockResolvedValue(["http://example.com/one", "http://example.com/two"]);
|
||||
await startTermsFlow(mockClient, [IM_SERVICE_ONE], interactionCallback);
|
||||
|
||||
expect(interactionCallback).toHaveBeenCalledWith(
|
||||
[
|
||||
{
|
||||
service: IM_SERVICE_ONE,
|
||||
policies: {
|
||||
policy_the_second: POLICY_TWO,
|
||||
},
|
||||
},
|
||||
],
|
||||
["http://example.com/one"],
|
||||
);
|
||||
expect(mockClient.agreeToTerms).toHaveBeenCalledWith(SERVICE_TYPES.IM, "https://imone.test", "a token token", [
|
||||
"http://example.com/one",
|
||||
"http://example.com/two",
|
||||
]);
|
||||
});
|
||||
|
||||
it("should prompt for only services with un-agreed policies", async function () {
|
||||
const directEvent = new MatrixEvent({
|
||||
type: EventType.Direct,
|
||||
content: {
|
||||
accepted: ["http://example.com/one"],
|
||||
},
|
||||
});
|
||||
mockClient.getAccountData.mockReturnValue(directEvent);
|
||||
|
||||
mockClient.getTerms.mockImplementation(
|
||||
async (_serviceTypes: SERVICE_TYPES, baseUrl: string): Promise<Terms> => {
|
||||
switch (baseUrl) {
|
||||
case "https://imone.test":
|
||||
return {
|
||||
policies: {
|
||||
policy_the_first: POLICY_ONE,
|
||||
},
|
||||
};
|
||||
case "https://imtwo.test":
|
||||
return {
|
||||
policies: {
|
||||
policy_the_second: POLICY_TWO,
|
||||
},
|
||||
};
|
||||
}
|
||||
return { policies: {} };
|
||||
},
|
||||
);
|
||||
|
||||
const interactionCallback = jest.fn().mockResolvedValue(["http://example.com/one", "http://example.com/two"]);
|
||||
await startTermsFlow(mockClient, [IM_SERVICE_ONE, IM_SERVICE_TWO], interactionCallback);
|
||||
|
||||
expect(interactionCallback).toHaveBeenCalledWith(
|
||||
[
|
||||
{
|
||||
service: IM_SERVICE_TWO,
|
||||
policies: {
|
||||
policy_the_second: POLICY_TWO,
|
||||
},
|
||||
},
|
||||
],
|
||||
["http://example.com/one"],
|
||||
);
|
||||
expect(mockClient.agreeToTerms).toHaveBeenCalledWith(SERVICE_TYPES.IM, "https://imone.test", "a token token", [
|
||||
"http://example.com/one",
|
||||
]);
|
||||
expect(mockClient.agreeToTerms).toHaveBeenCalledWith(SERVICE_TYPES.IM, "https://imtwo.test", "a token token", [
|
||||
"http://example.com/two",
|
||||
]);
|
||||
});
|
||||
});
|
||||
|
||||
describe("dialogTermsInteractionCallback", () => {
|
||||
it("should render a dialog with the expected terms", async () => {
|
||||
dialogTermsInteractionCallback(
|
||||
[
|
||||
{
|
||||
service: new Service(SERVICE_TYPES.IS, "http://base_url", "access_token"),
|
||||
policies: {
|
||||
sample: {
|
||||
version: "VERSION",
|
||||
en: {
|
||||
name: "Terms",
|
||||
url: "http://base_url/terms",
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
],
|
||||
[],
|
||||
);
|
||||
|
||||
const dialog = await screen.findByRole("dialog");
|
||||
expect(within(dialog).getByRole("link")).toHaveAttribute("href", "http://base_url/terms");
|
||||
expect(dialog).toMatchSnapshot();
|
||||
});
|
||||
});
|
||||
Reference in New Issue
Block a user