sorb/ThreadNet-Web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

Enable oxlint restriction ruleset (#34307)

Browse Source 
* 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

* Enable restriction ruleset

* Make code comply with new rules

* Make code comply with react/button-has-type

* Make code comply with typescript/non-nullable-type-assertion-style

* Comply with node/no-process-env

* Comply with unicorn/prefer-node-protocol

* Comply with unicorn/import-style

* Comply with unicorn/no-process-exit

* Comply with no-proto

* Comply with node/handle-callback-err

* Comply with import/no-commonjs

* Comply with node/no-path-concat

* Comply with unicorn/no-length-as-slice-end

* Comply with unicorn/no-document-cookie

* Comply with unicorn/prefer-module

* Comply with typescript/prefer-literal-enum-member

* Comply with jsx-a11y/anchor-ambiguous-text

* Tweak oxlint config

* Fix resolves

* Iterate

* Iterate

* Iterate

* Iterate

* Iterate

* Iterate

* Iterate
This commit is contained in:
Michael Telatynski
2026-08-04 09:15:07 +00:00
committed by GitHub
parent c091ebec6e
commit 4aa1a3549e
167 changed files with 526 additions and 346 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/web/test/globalSetup.ts
+1
View File
@@ -6,6 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
Please see LICENSE files in the repository root for full details.
*/
// oxlint-disable-next-line import/no-commonjs,unicorn/prefer-module
module.exports = async () => {
process.env.TZ = "UTC";
};
apps/web/test/setupTests.ts
+2 -2
View File
@@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
Please see LICENSE files in the repository root for full details.
*/
import { env } from "process";
import { env } from "node:process";
import "@testing-library/jest-dom";
import "blob-polyfill";
import { secureRandomString } from "matrix-js-sdk/src/randomstring";
@@ -61,7 +61,7 @@ if (env["GITHUB_ACTIONS"] !== undefined) {
//
// These are also require() calls to make sure they get called
// synchronously.
/* eslint-disable @typescript-eslint/no-require-imports */
/* eslint-disable @typescript-eslint/no-require-imports,import/no-commonjs,unicorn/prefer-module */
require("./setup/setupManualMocks"); // must be first
require("./setup/setupLanguage");
require("./setup/setupConfig");
apps/web/test/test-utils/audio.ts
+1 -1
View File
@@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
Please see LICENSE files in the repository root for full details.
*/
import EventEmitter from "events";
import EventEmitter from "node:events";
import { SimpleObservable } from "matrix-widget-api";
import { type Playback, PlaybackState } from "../../src/audio/Playback";
apps/web/test/test-utils/client.ts
+1 -1
View File
@@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
Please see LICENSE files in the repository root for full details.
*/
import EventEmitter from "events";
import EventEmitter from "node:events";
import { type MockedObject } from "vitest";
import { type MethodLikeKeys, type PropertyLikeKeys } from "jest-mock";
import { type MockedObjectDeep } from "@vitest/spy";
apps/web/test/test-utils/test-utils.ts
+1 -1
View File
@@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
Please see LICENSE files in the repository root for full details.
*/
import EventEmitter from "events";
import EventEmitter from "node:events";
import { type MockedObject } from "vitest";
import {
MatrixEvent,
apps/web/test/test-utils/utilities.ts
+1 -1
View File
@@ -8,7 +8,7 @@ Please see LICENSE files in the repository root for full details.
import { act } from "test-utils-rtl";
import type EventEmitter from "events";
import type EventEmitter from "node:events";
import { type ActionPayload } from "../../src/dispatcher/payloads";
import defaultDispatcher from "../../src/dispatcher/dispatcher";
import { type DispatcherAction } from "../../src/dispatcher/actions";
apps/web/test/unit-tests/LegacyCallHandler-test.ts
+1 -1
View File
@@ -17,7 +17,7 @@ import {
} from "matrix-js-sdk/src/matrix";
import { KnownMembership } from "matrix-js-sdk/src/types";
import { CallEvent, CallState, CallType, MatrixCall } from "matrix-js-sdk/src/webrtc/call";
import EventEmitter from "events";
import EventEmitter from "node:events";
import { mocked } from "jest-mock";
import { CallEventHandlerEvent } from "matrix-js-sdk/src/webrtc/callEventHandler";
import fetchMock from "@fetch-mock/jest";
apps/web/test/unit-tests/audio/MockedPlayback.ts
+1 -1
View File
@@ -5,7 +5,7 @@
* Please see LICENSE files in the repository root for full details.
*/
import EventEmitter from "events";
import EventEmitter from "node:events";
import { SimpleObservable } from "matrix-widget-api";
import { PlaybackState } from "../../../src/audio/Playback";
apps/web/test/unit-tests/audio/VoiceRecording-test.ts
+1 -1
View File
@@ -136,7 +136,7 @@ describe("VoiceRecording", () => {
MediaDeviceHandlerMock.getAudioInput.mockReturnValue("default");
await recording.start();
const constraints = mocked(navigator.mediaDevices.getUserMedia).mock.calls[0][0] as MediaStreamConstraints;
const constraints = mocked(navigator.mediaDevices.getUserMedia).mock.calls[0][0]!;
expect(constraints.audio).toEqual(
expect.not.objectContaining({
deviceId: expect.anything(),
apps/web/test/unit-tests/components/structures/MessagePanel-test.tsx
+1 -1
View File
@@ -8,7 +8,7 @@ Please see LICENSE files in the repository root for full details.
*/
import React from "react";
import { EventEmitter } from "events";
import { EventEmitter } from "node:events";
import { type MatrixEvent, Room, RoomMember, type Thread, ReceiptType } from "matrix-js-sdk/src/matrix";
import { KnownMembership } from "matrix-js-sdk/src/types";
import { render, within } from "jest-matrix-react";
apps/web/test/unit-tests/components/structures/__snapshots__/RoomView-test.tsx.snap
+10
View File
@@ -25,6 +25,7 @@ exports[`RoomView for a local room in state CREATING should match the snapshot 1
aria-label="Room info"
class="mx_RoomHeader_infoWrapper"
tabindex="0"
type="button"
>
<div
class="mx_RoomHeader_info _box-flex_1odfs_9"
@@ -109,6 +110,7 @@ exports[`RoomView for a local room in state ERROR should match the snapshot 1`]
aria-label="Room info"
class="mx_RoomHeader_infoWrapper"
tabindex="0"
type="button"
>
<div
class="mx_RoomHeader_info _box-flex_1odfs_9"
@@ -305,6 +307,7 @@ exports[`RoomView for a local room in state NEW should match the snapshot 1`] =
aria-label="Room info"
class="mx_RoomHeader_infoWrapper"
tabindex="0"
type="button"
>
<div
class="mx_RoomHeader_info _box-flex_1odfs_9"
@@ -692,6 +695,7 @@ exports[`RoomView for a local room in state NEW that is encrypted should match t
aria-label="Room info"
class="mx_RoomHeader_infoWrapper"
tabindex="0"
type="button"
>
<div
class="mx_RoomHeader_info _box-flex_1odfs_9"
@@ -1161,6 +1165,7 @@ exports[`RoomView should hide the composer when hideComposer=true 1`] = `
aria-label="Room info"
class="mx_RoomHeader_infoWrapper"
tabindex="0"
type="button"
>
<div
class="mx_RoomHeader_info _box-flex_1odfs_9"
@@ -1715,6 +1720,7 @@ exports[`RoomView should hide the pinned message banner when hidePinnedMessageBa
aria-label="Room info"
class="mx_RoomHeader_infoWrapper"
tabindex="0"
type="button"
>
<div
class="mx_RoomHeader_info _box-flex_1odfs_9"
@@ -2199,6 +2205,7 @@ exports[`RoomView should hide the right panel when hideRightPanel=true 1`] = `
aria-label="Room info"
class="mx_RoomHeader_infoWrapper"
tabindex="0"
type="button"
>
<div
class="mx_RoomHeader_info _box-flex_1odfs_9"
@@ -2683,6 +2690,7 @@ exports[`RoomView should not display the timeline when the room encryption is lo
aria-label="Room info"
class="mx_RoomHeader_infoWrapper"
tabindex="0"
type="button"
>
<div
class="mx_RoomHeader_info _box-flex_1odfs_9"
@@ -2903,6 +2911,7 @@ exports[`RoomView should not display the timeline when the room encryption is lo
aria-label="Room info"
class="mx_RoomHeader_infoWrapper"
tabindex="0"
type="button"
>
<div
class="mx_RoomHeader_info _box-flex_1odfs_9"
@@ -3445,6 +3454,7 @@ exports[`RoomView video rooms should render joined video room view 1`] = `
aria-label="Room info"
class="mx_RoomHeader_infoWrapper"
tabindex="0"
type="button"
>
<div
class="mx_RoomHeader_info _box-flex_1odfs_9"
apps/web/test/unit-tests/components/views/beacon/LeftPanelLiveShareWarning-test.tsx
+1 -2
View File
@@ -18,8 +18,7 @@ import dispatcher from "../../../../../src/dispatcher/dispatcher";
import { Action } from "../../../../../src/dispatcher/actions";
jest.mock("../../../../../src/stores/OwnBeaconStore", () => {
// eslint-disable-next-line @typescript-eslint/no-require-imports
const EventEmitter = require("events");
const EventEmitter = jest.requireActual("events");
class MockOwnBeaconStore extends EventEmitter {
public getLiveBeaconIdsWithLocationPublishError = jest.fn().mockReturnValue([]);
public getBeaconById = jest.fn();
apps/web/test/unit-tests/components/views/dialogs/BaseDialog-test.tsx
+1 -1
View File
@@ -18,7 +18,7 @@ describe("BaseDialog", () => {
// Autolock's autofocus in the empty dialog is focusing on the close button and bringing up the tooltip
// So we either need to call escape twice(one for the tooltip and one for the dialog) or focus
// on the dialog first.
const dialog = container.querySelector('[role="dialog"]') as HTMLElement;
const dialog = container.querySelector<HTMLElement>('[role="dialog"]')!;
dialog?.focus();
await userEvent.keyboard("{Escape}");
expect(onFinished).toHaveBeenCalled();
apps/web/test/unit-tests/components/views/dialogs/__snapshots__/DevtoolsDialog-test.tsx.snap
+15 -1
View File
@@ -76,41 +76,49 @@ exports[`DevtoolsDialog renders the devtools dialog 1`] = `
</h2>
<button
class="mx_DevTools_button"
type="button"
>
Send custom timeline event
</button>
<button
class="mx_DevTools_button"
type="button"
>
Explore room state
</button>
<button
class="mx_DevTools_button"
type="button"
>
Explore room account data
</button>
<button
class="mx_DevTools_button"
type="button"
>
View servers in room
</button>
<button
class="mx_DevTools_button"
type="button"
>
Notifications debug
</button>
<button
class="mx_DevTools_button"
type="button"
>
Active Widgets
</button>
<button
class="mx_DevTools_button"
type="button"
>
Users
</button>
<button
class="mx_DevTools_button"
type="button"
>
Explore sticky state
</button>
@@ -123,21 +131,25 @@ exports[`DevtoolsDialog renders the devtools dialog 1`] = `
</h2>
<button
class="mx_DevTools_button"
type="button"
>
Explore account data
</button>
<button
class="mx_DevTools_button"
type="button"
>
Settings explorer
</button>
<button
class="mx_DevTools_button"
type="button"
>
Server info
</button>
<button
class="mx_DevTools_button"
type="button"
>
End-to-end encryption
</button>
@@ -317,7 +329,9 @@ exports[`DevtoolsDialog renders the devtools dialog 1`] = `
<div
class="mx_Dialog_buttons"
>
<button>
<button
type="button"
>
Back
</button>
</div>
apps/web/test/unit-tests/components/views/dialogs/devtools/__snapshots__/Event-test.tsx.snap
+12 -4
View File
@@ -51,10 +51,14 @@ exports[`<EventEditor /> should render 1`] = `
<div
class="mx_Dialog_buttons"
>
<button>
<button
type="button"
>
Back
</button>
<button>
<button
type="button"
>
Send
</button>
</div>
@@ -115,10 +119,14 @@ exports[`<EventEditor /> thread context should pre-populate a thread relationshi
<div
class="mx_Dialog_buttons"
>
<button>
<button
type="button"
>
Back
</button>
<button>
<button
type="button"
>
Send
</button>
</div>
apps/web/test/unit-tests/components/views/dialogs/devtools/__snapshots__/RoomNotifications-test.tsx.snap
+3 -1
View File
@@ -64,7 +64,9 @@ exports[`<RoomNotifications /> should render 1`] = `
<div
class="mx_Dialog_buttons"
>
<button>
<button
type="button"
>
Back
</button>
</div>
apps/web/test/unit-tests/components/views/dialogs/devtools/__snapshots__/Users-test.tsx.snap
+18 -5
View File
@@ -185,7 +185,9 @@ exports[`<Users /> should render a single device - signed by owner 1`] = `
<div
class="mx_Dialog_buttons"
>
<button>
<button
type="button"
>
Back
</button>
</div>
@@ -377,7 +379,9 @@ exports[`<Users /> should render a single device - unsigned 1`] = `
<div
class="mx_Dialog_buttons"
>
<button>
<button
type="button"
>
Back
</button>
</div>
@@ -571,7 +575,9 @@ exports[`<Users /> should render a single device - verified by cross-signing 1`]
<div
class="mx_Dialog_buttons"
>
<button>
<button
type="button"
>
Back
</button>
</div>
@@ -672,6 +678,7 @@ exports[`<Users /> should render a single user 1`] = `
<li>
<button
class="mx_DevTools_button"
type="button"
>
<div
class="mx_E2EIcon mx_E2EIcon_inline"
@@ -698,6 +705,7 @@ exports[`<Users /> should render a single user 1`] = `
<li>
<button
class="mx_DevTools_button"
type="button"
>
<div
class="mx_E2EIcon mx_E2EIcon_inline"
@@ -722,6 +730,7 @@ exports[`<Users /> should render a single user 1`] = `
<li>
<button
class="mx_DevTools_button"
type="button"
>
<div
class="mx_E2EIcon mx_E2EIcon_inline"
@@ -757,7 +766,9 @@ exports[`<Users /> should render a single user 1`] = `
<div
class="mx_Dialog_buttons"
>
<button>
<button
type="button"
>
Back
</button>
</div>
@@ -828,7 +839,9 @@ exports[`<Users /> should render a user list 1`] = `
<div
class="mx_Dialog_buttons"
>
<button>
<button
type="button"
>
Back
</button>
</div>
apps/web/test/unit-tests/components/views/dialogs/security/__snapshots__/ExportE2eKeysDialog-test.tsx.snap
+3 -1
View File
@@ -92,7 +92,9 @@ exports[`ExportE2eKeysDialog renders 1`] = `
type="submit"
value="Export"
/>
<button>
<button
type="button"
>
Cancel
</button>
</div>
apps/web/test/unit-tests/components/views/dialogs/security/__snapshots__/ImportE2eKeysDialog-test.tsx.snap
+3 -1
View File
@@ -93,7 +93,9 @@ exports[`ImportE2eKeysDialog renders 1`] = `
type="submit"
value="Import"
/>
<button>
<button
type="button"
>
Cancel
</button>
</div>
apps/web/test/unit-tests/components/views/elements/FilterDropdown-test.tsx
+1 -1
View File
@@ -33,7 +33,7 @@ describe("<FilterDropdown />", () => {
await act(async () => {
const button = container.querySelector('[role="button"]');
expect(button).toBeTruthy();
fireEvent.click(button as Element);
fireEvent.click(button!);
await flushPromises();
});
apps/web/test/unit-tests/components/views/elements/ImageView-test.tsx
+1 -1
View File
@@ -85,7 +85,7 @@ describe("<ImageView />", () => {
<ImageView src="https://example.com/image.png" name="filename.png" onFinished={jest.fn()} />,
);
const dialog = container.querySelector('[role="dialog"]') as HTMLElement;
const dialog = container.querySelector<HTMLElement>('[role="dialog"]')!;
dialog?.focus();
fireEvent.keyDown(dialog!, { key: "s", code: "KeyS", ctrlKey: true });
apps/web/test/unit-tests/components/views/elements/__snapshots__/EventListSummary-test.tsx.snap
+5
View File
@@ -7,6 +7,7 @@ exports[`EventListSummary correctly identifies transitions 1`] = `
<span>
<button
class="mx_EventTile_spoiler"
type="button"
>
 
<span
@@ -34,6 +35,7 @@ exports[`EventListSummary correctly orders sequences of transitions by the order
<span>
<button
class="mx_EventTile_spoiler"
type="button"
>
 
<span
@@ -131,6 +133,7 @@ exports[`EventListSummary handles many users following the same sequence of memb
<span>
<button
class="mx_EventTile_spoiler"
type="button"
>
 
<span
@@ -155,6 +158,7 @@ exports[`EventListSummary handles multiple users following the same sequence of
<span>
<button
class="mx_EventTile_spoiler"
type="button"
>
 
<span
@@ -257,6 +261,7 @@ exports[`EventListSummary truncates multiple sequences of repetitions with other
<span>
<button
class="mx_EventTile_spoiler"
type="button"
>
 
<span
apps/web/test/unit-tests/components/views/emojipicker/EmojiPicker-test.tsx
+5 -5
View File
@@ -422,11 +422,11 @@ describe("EmojiPicker", function () {
});
// Initially, people category should be visible
const peopleTab = container.querySelector('[title*="Smileys"]') as HTMLButtonElement;
const peopleTab = container.querySelector('[title*="Smileys"]')!;
expect(peopleTab).toHaveAttribute("tabindex", "0");
// Click on nature category tab
const natureTab = container.querySelector('[title*="Animals"]') as HTMLButtonElement;
const natureTab = container.querySelector('[title*="Animals"]')!;
await userEvent.click(natureTab);
// Wait for scroll and visibility update
@@ -444,7 +444,7 @@ describe("EmojiPicker", function () {
});
// Focus on the category header
const peopleTab = container.querySelector('[title*="Smileys"]') as HTMLButtonElement;
const peopleTab = container.querySelector<HTMLButtonElement>('[title*="Smileys"]')!;
peopleTab.focus();
expect(peopleTab).toHaveFocus();
@@ -471,14 +471,14 @@ describe("EmojiPicker", function () {
});
// Focus on the category header
const peopleTab = container.querySelector('[title*="Smileys"]') as HTMLButtonElement;
const peopleTab = container.querySelector<HTMLButtonElement>('[title*="Smileys"]')!;
peopleTab.focus();
// Press End to jump to last category
await userEvent.keyboard("[End]");
await waitFor(() => {
const flagsTab = container.querySelector('[title*="Flags"]') as HTMLButtonElement;
const flagsTab = container.querySelector('[title*="Flags"]')!;
expect(flagsTab).toHaveFocus();
});
apps/web/test/unit-tests/components/views/messages/MImageReplyBody-test.tsx
+3 -3
View File
@@ -227,7 +227,7 @@ describe("<MImageReplyBody />", () => {
it("opens the image viewer with thumbnail geometry", async () => {
const { container } = renderBase();
await waitFor(() => expect(screen.getByRole("img", { name: "demo image" })).toBeInTheDocument());
const image = container.querySelector("img.mx_MImageBody_thumbnail") as HTMLImageElement;
const image = container.querySelector("img.mx_MImageBody_thumbnail")!;
image.getBoundingClientRect = () => ({ width: 100, height: 80, x: 10, y: 20 }) as DOMRect;
jest.spyOn(Modal, "createDialog").mockReturnValue({} as any);
@@ -257,7 +257,7 @@ describe("<MImageReplyBody />", () => {
it("updates load dimensions and toggles hover/focus banner state", async () => {
const { container, ref } = renderBase();
await waitFor(() => expect(screen.getByRole("img", { name: "demo image" })).toBeInTheDocument());
const image = container.querySelector("img.mx_MImageBody_thumbnail") as HTMLImageElement;
const image = container.querySelector("img.mx_MImageBody_thumbnail")!;
Object.defineProperty(image, "naturalWidth", { configurable: true, value: 640 });
Object.defineProperty(image, "naturalHeight", { configurable: true, value: 480 });
@@ -466,7 +466,7 @@ describe("<MImageReplyBody />", () => {
},
});
await waitFor(() => expect(container.querySelector("img[style*='display: none']")).not.toBeNull());
const image = container.querySelector("img[style*='display: none']") as HTMLImageElement;
const image = container.querySelector("img[style*='display: none']")!;
Object.defineProperty(image, "naturalWidth", { configurable: true, value: 640 });
Object.defineProperty(image, "naturalHeight", { configurable: true, value: 480 });
apps/web/test/unit-tests/components/views/messages/MessageEvent-test.tsx
+2 -2
View File
@@ -10,8 +10,8 @@ import React from "react";
import { fireEvent, render, type RenderResult } from "jest-matrix-react";
import { type MatrixClient, type MatrixEvent, EventType, type Room, MsgType } from "matrix-js-sdk/src/matrix";
import fetchMock from "@fetch-mock/jest";
import fs from "fs";
import path from "path";
import fs from "node:fs";
import path from "node:path";
import SettingsStore from "../../../../../src/settings/SettingsStore";
import { mkEvent, mkRoom, stubClient } from "../../../../test-utils";
apps/web/test/unit-tests/components/views/messages/__snapshots__/TextualBody-test.tsx.snap
+1
View File
@@ -541,6 +541,7 @@ exports[`<TextualBody /> renders formatted m.text correctly spoilers get injecte
Hey
<button
class="mx_EventTile_spoiler"
type="button"
>
<span
class="mx_EventTile_spoiler_reason"
apps/web/test/unit-tests/components/views/right_panel/UserInfo-test.tsx
+1 -1
View File
@@ -19,7 +19,7 @@ import {
ProfileKeyTimezone,
ProfileKeyMSC4175Timezone,
} from "matrix-js-sdk/src/matrix";
import { EventEmitter } from "events";
import { EventEmitter } from "node:events";
import {
UserVerificationStatus,
type VerificationRequest,
apps/web/test/unit-tests/components/views/settings/devices/FilteredDeviceList-test.tsx
+3 -3
View File
@@ -112,11 +112,11 @@ describe("<FilteredDeviceList />", () => {
const setFilter = async (container: HTMLElement, option: DeviceSecurityVariation | string) => {
const dropdown = container.querySelector('[aria-label="Filter devices"]');
fireEvent.click(dropdown as Element);
fireEvent.click(dropdown!);
// tick to let dropdown render
await flushPromises();
fireEvent.click(container.querySelector(`#device-list-filter__${option}`) as Element);
fireEvent.click(container.querySelector(`#device-list-filter__${option}`)!);
};
it("does not display filter description when filter is falsy", () => {
@@ -219,7 +219,7 @@ describe("<FilteredDeviceList />", () => {
act(() => {
const tile = getByTestId(`device-tile-${hundredDaysOld.device_id}`);
const toggle = tile.querySelector('[aria-label="Show details"]');
fireEvent.click(toggle as Element);
fireEvent.click(toggle!);
});
expect(onDeviceExpandToggle).toHaveBeenCalledWith(hundredDaysOld.device_id);
apps/web/test/unit-tests/components/views/settings/tabs/room/__snapshots__/SecurityRoomSettingsTab-test.tsx.snap
+1
View File
@@ -123,6 +123,7 @@ exports[`<SecurityRoomSettingsTab /> join rule handles error when updating join
>
<button
class="mx_Dialog_primary"
type="button"
>
OK
</button>
apps/web/test/unit-tests/components/views/settings/tabs/user/SessionManagerTab-test.tsx
+13 -19
View File
@@ -948,18 +948,16 @@ describe("<SessionManagerTab />", () => {
toggleDeviceDetails(getByTestId, alicesMobileDevice.device_id);
const deviceDetails = getByTestId(`device-detail-${alicesMobileDevice.device_id}`);
const signOutButton = deviceDetails.querySelector(
'[data-testid="device-detail-sign-out-cta"]',
) as Element;
const signOutButton = deviceDetails.querySelector('[data-testid="device-detail-sign-out-cta"]')!;
fireEvent.click(signOutButton);
await confirmSignout(getByTestId, false);
// doesnt enter loading state
expect(
(deviceDetails.querySelector('[data-testid="device-detail-sign-out-cta"]') as Element).getAttribute(
"aria-disabled",
),
deviceDetails
.querySelector('[data-testid="device-detail-sign-out-cta"]')!
.getAttribute("aria-disabled"),
).toEqual(null);
// delete not called
expect(mockClient.deleteMultipleDevices).not.toHaveBeenCalled();
@@ -991,9 +989,7 @@ describe("<SessionManagerTab />", () => {
toggleDeviceDetails(getByTestId, alicesMobileDevice.device_id);
const deviceDetails = getByTestId(`device-detail-${alicesMobileDevice.device_id}`);
const signOutButton = deviceDetails.querySelector(
'[data-testid="device-detail-sign-out-cta"]',
) as Element;
const signOutButton = deviceDetails.querySelector('[data-testid="device-detail-sign-out-cta"]')!;
fireEvent.click(signOutButton);
await confirmSignout(getByTestId);
@@ -1052,17 +1048,15 @@ describe("<SessionManagerTab />", () => {
toggleDeviceDetails(getByTestId, alicesMobileDevice.device_id);
const deviceDetails = getByTestId(`device-detail-${alicesMobileDevice.device_id}`);
const signOutButton = deviceDetails.querySelector(
'[data-testid="device-detail-sign-out-cta"]',
) as Element;
const signOutButton = deviceDetails.querySelector('[data-testid="device-detail-sign-out-cta"]')!;
fireEvent.click(signOutButton);
await confirmSignout(getByTestId);
// button is loading
expect(
(deviceDetails.querySelector('[data-testid="device-detail-sign-out-cta"]') as Element).getAttribute(
"aria-disabled",
),
deviceDetails
.querySelector('[data-testid="device-detail-sign-out-cta"]')!
.getAttribute("aria-disabled"),
).toEqual("true");
await flushPromises();
@@ -1094,9 +1088,9 @@ describe("<SessionManagerTab />", () => {
// loading state cleared
expect(
(deviceDetails.querySelector('[data-testid="device-detail-sign-out-cta"]') as Element).getAttribute(
"aria-disabled",
),
deviceDetails
.querySelector('[data-testid="device-detail-sign-out-cta"]')!
.getAttribute("aria-disabled"),
).toEqual(null);
});
@@ -1241,7 +1235,7 @@ describe("<SessionManagerTab />", () => {
const deviceDetails = getByTestId(`device-detail-${alicesMobileDevice.device_id}`);
const manageDeviceButton = deviceDetails.querySelector(
'[data-testid="device-detail-sign-out-cta"]',
) as Element;
)!;
expect(manageDeviceButton).toHaveAttribute(
"href",
`https://issuer.org/account?action=org.matrix.session_view&device_id=${alicesMobileDevice.device_id}`,
apps/web/test/unit-tests/components/views/spaces/SpacePanel-test.tsx
+3 -2
View File
@@ -35,12 +35,14 @@ enum Keys {
ARROW_DOWN = 40,
}
/* oxlint-disable typescript/prefer-literal-enum-member */
enum DragDirection {
LEFT = Keys.ARROW_LEFT,
UP = Keys.ARROW_UP,
RIGHT = Keys.ARROW_RIGHT,
DOWN = Keys.ARROW_DOWN,
}
/* oxlint-enable typescript/prefer-literal-enum-member */
// taken from https://github.com/hello-pangea/dnd/blob/main/test/unit/integration/util/controls.ts#L20
const createTransitionEndEvent = (): Event => {
@@ -86,8 +88,7 @@ const drop = async (element: HTMLElement) => {
};
jest.mock("../../../../../src/stores/spaces/SpaceStore", () => {
// eslint-disable-next-line @typescript-eslint/no-require-imports
const EventEmitter = require("events");
const EventEmitter = jest.requireActual("events");
class MockSpaceStore extends EventEmitter {
invitedSpaces: SpaceKey[] = [];
enabledMetaSpaces: MetaSpace[] = [];
apps/web/test/unit-tests/components/views/spaces/SpaceTreeLevel-test.tsx
+1 -2
View File
@@ -21,8 +21,7 @@ import { NotificationLevel } from "../../../../../src/stores/notifications/Notif
import { SDKContextClass } from "../../../../../src/contexts/SDKContextClass";
jest.mock("../../../../../src/stores/spaces/SpaceStore", () => {
// eslint-disable-next-line @typescript-eslint/no-require-imports
const EventEmitter = require("events");
const EventEmitter = jest.requireActual("events");
class MockSpaceStore extends EventEmitter {
activeSpace: SpaceKey = "!space1";
setActiveSpace = jest.fn();
apps/web/test/unit-tests/models/Call-test.ts
+1 -1
View File
@@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
Please see LICENSE files in the repository root for full details.
*/
import EventEmitter from "events";
import EventEmitter from "node:events";
import { mocked } from "jest-mock";
import { waitFor } from "jest-matrix-react";
import {
apps/web/test/unit-tests/modules/ExtrasApi-test.tsx
+1 -1
View File
@@ -8,7 +8,7 @@
import React, { act } from "react";
import { render, type RenderOptions } from "jest-matrix-react";
import { type MatrixClient, PendingEventOrdering, Room } from "matrix-js-sdk/src/matrix";
import { EventEmitter } from "events";
import { EventEmitter } from "node:events";
import { stubClient } from "../../test-utils";
import DMRoomMap from "../../../src/utils/DMRoomMap";
apps/web/test/unit-tests/stores/RoomViewStore-test.ts
+2 -4
View File
@@ -13,7 +13,7 @@ import {
RoomViewLifecycle,
type ViewRoomOpts,
} from "@matrix-org/react-sdk-module-api/lib/lifecycles/RoomViewLifecycle";
import EventEmitter from "events";
import EventEmitter from "node:events";
import { RoomViewStore } from "../../../src/stores/RoomViewStore";
import { Action } from "../../../src/dispatcher/actions";
@@ -98,9 +98,7 @@ jest.mock("../../../src/utils/DMRoomMap", () => {
});
jest.mock("../../../src/stores/WidgetStore", () => {
// This mock needs to use a real EventEmitter; require is the only way to import that in a hoisted block
// eslint-disable-next-line @typescript-eslint/no-require-imports
const EventEmitter = require("events");
const EventEmitter = jest.requireActual("events");
const apps: IApp[] = [];
const instance = new (class extends EventEmitter {
getApps() {
apps/web/test/unit-tests/utils/MegolmExportEncryption-test.ts
+3 -4
View File
@@ -6,8 +6,8 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
Please see LICENSE files in the repository root for full details.
*/
import { TextEncoder } from "util";
import nodeCrypto from "crypto";
import { TextEncoder } from "node:util";
import nodeCrypto from "node:crypto";
import { Crypto } from "@peculiar/webcrypto";
import type * as MegolmExportEncryptionExport from "../../../src/utils/MegolmExportEncryption";
@@ -74,8 +74,7 @@ describe("MegolmExportEncryption", function () {
subtle: webCrypto.subtle,
},
});
// eslint-disable-next-line @typescript-eslint/no-require-imports
MegolmExportEncryption = require("../../../src/utils/MegolmExportEncryption");
MegolmExportEncryption = jest.requireActual("../../../src/utils/MegolmExportEncryption");
});
describe("decrypt", function () {
apps/web/test/unit-tests/utils/SessionLock-test.ts
+1 -1
View File
@@ -252,7 +252,7 @@ describe("SessionLock", () => {
const window2 = createWindow();
// import the dependencies of getSessionLock into the new context
// eslint-disable-next-line @typescript-eslint/no-require-imports
// eslint-disable-next-line typescript/no-require-imports,typescript/no-var-requires
window2._logger = require("matrix-js-sdk/src/logger");
window2.SESSION_LOCK_CONSTANTS = SESSION_LOCK_CONSTANTS;
apps/web/test/viewmodels/event-tiles/E2eMessageSharedIconViewModel-test.ts
+1 -1
View File
@@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
Please see LICENSE files in the repository root for full details.
*/
import { EventEmitter } from "events";
import { EventEmitter } from "node:events";
import {
EventTimeline,
RoomStateEvent,
apps/web/test/viewmodels/event-tiles/MJitsiWidgetEventViewModel-test.ts
+1 -1
View File
@@ -5,7 +5,7 @@
* Please see LICENSE files in the repository root for full details.
*/
import { EventEmitter } from "events";
import { EventEmitter } from "node:events";
import { type MatrixClient, type Room } from "matrix-js-sdk/src/matrix";
import { MJitsiWidgetEventViewModel } from "../../../src/viewmodels/room/timeline/event-tile/MJitsiWidgetEventViewModel";
apps/web/test/viewmodels/event-tiles/ThreadSummaryViewModel-test.ts
+1 -1
View File
@@ -5,7 +5,7 @@
* Please see LICENSE files in the repository root for full details.
*/
import { EventEmitter } from "events";
import { EventEmitter } from "node:events";
import { type MouseEvent } from "react";
import {
EventType,
apps/web/test/viewmodels/room-list/RoomListItemViewModel-test.ts
+1 -1
View File
@@ -5,7 +5,7 @@
* Please see LICENSE files in the repository root for full details.
*/
import EventEmitter from "events";
import EventEmitter from "node:events";
import {
type MatrixClient,
type MatrixEvent,
apps/web/test/viewmodels/room/EventTileActionBarViewModel-test.ts
+1 -1
View File
@@ -5,7 +5,7 @@
* Please see LICENSE files in the repository root for full details.
*/
import EventEmitter from "events";
import EventEmitter from "node:events";
import { waitFor } from "@testing-library/dom";
import { mocked } from "jest-mock";
import {