Skip to content

Commit 4f39071

Browse files
committed
chore: fix lint and rebase
1 parent 6a8d458 commit 4f39071

File tree

2 files changed

+4
-72
lines changed

2 files changed

+4
-72
lines changed

test/unit-tests/components/viewmodels/right_panel/user_info/UserInfoPowerLevelsViewModel-test.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ import { type IRoomPermissions } from "../../../../../../src/components/views/ri
1515
import Modal from "../../../../../../src/Modal";
1616
import { warnSelfDemote } from "../../../../../../src/components/views/right_panel/UserInfo";
1717

18-
jest.mock("../../../../../../../src/Modal", () => ({
18+
jest.mock("../../../../../../src/Modal", () => ({
1919
createDialog: jest.fn(),
2020
}));
2121

22-
jest.mock("../../../../../../../src/components/views/right_panel/UserInfo", () => ({
22+
jest.mock("../../../../../../src/components/views/right_panel/UserInfo", () => ({
2323
warnSelfDemote: jest.fn(),
2424
}));
2525

test/unit-tests/components/views/right_panel/UserInfo-test.tsx

Lines changed: 2 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,10 @@ Please see LICENSE files in the repository root for full details.
77
*/
88

99
import React from "react";
10-
import { fireEvent, render, screen, act, waitForElementToBeRemoved, waitFor } from "jest-matrix-react";
10+
import { render, screen, act, waitForElementToBeRemoved, waitFor } from "jest-matrix-react";
1111
import userEvent from "@testing-library/user-event";
1212
import { type Mocked, mocked } from "jest-mock";
13-
import {
14-
type Room,
15-
User,
16-
type MatrixClient,
17-
RoomMember,
18-
MatrixEvent,
19-
EventType,
20-
Device,
21-
} from "matrix-js-sdk/src/matrix";
13+
import { type Room, User, type MatrixClient, RoomMember, Device } from "matrix-js-sdk/src/matrix";
2214
import { EventEmitter } from "events";
2315
import {
2416
UserVerificationStatus,
@@ -31,7 +23,6 @@ import {
3123
import UserInfo, {
3224
disambiguateDevices,
3325
getPowerLevels,
34-
PowerLevelEditor,
3526
UserInfoHeader,
3627
UserOptionsSection,
3728
} from "../../../../../src/components/views/right_panel/UserInfo";
@@ -717,65 +708,6 @@ describe("<UserOptionsSection />", () => {
717708
);
718709
});
719710

720-
describe("<PowerLevelEditor />", () => {
721-
const defaultMember = new RoomMember(defaultRoomId, defaultUserId);
722-
723-
let defaultProps: Parameters<typeof PowerLevelEditor>[0];
724-
beforeEach(() => {
725-
defaultProps = {
726-
user: defaultMember,
727-
room: mockRoom,
728-
roomPermissions: {
729-
modifyLevelMax: 100,
730-
canEdit: false,
731-
canInvite: false,
732-
},
733-
};
734-
});
735-
736-
const renderComponent = (props = {}) => {
737-
const Wrapper = (wrapperProps = {}) => {
738-
return <MatrixClientContext.Provider value={mockClient} {...wrapperProps} />;
739-
};
740-
741-
return render(<PowerLevelEditor {...defaultProps} {...props} />, {
742-
wrapper: Wrapper,
743-
});
744-
};
745-
746-
it("renders a power level combobox", () => {
747-
renderComponent();
748-
749-
expect(screen.getByRole("combobox", { name: "Power level" })).toBeInTheDocument();
750-
});
751-
752-
it("renders a combobox and attempts to change power level on change of the combobox", async () => {
753-
const startPowerLevel = 999;
754-
const powerLevelEvent = new MatrixEvent({
755-
type: EventType.RoomPowerLevels,
756-
content: { users: { [defaultUserId]: startPowerLevel }, users_default: 1 },
757-
});
758-
mockRoom.currentState.getStateEvents.mockReturnValue(powerLevelEvent);
759-
mockClient.getSafeUserId.mockReturnValueOnce(defaultUserId);
760-
mockClient.getUserId.mockReturnValueOnce(defaultUserId);
761-
mockClient.setPowerLevel.mockResolvedValueOnce({ event_id: "123" });
762-
renderComponent();
763-
764-
const changedPowerLevel = 100;
765-
766-
fireEvent.change(screen.getByRole("combobox", { name: "Power level" }), {
767-
target: { value: changedPowerLevel },
768-
});
769-
770-
await screen.findByText("Demote", { exact: true });
771-
772-
// firing the event will raise a dialog warning about self demotion, wait for this to appear then click on it
773-
await userEvent.click(await screen.findByText("Demote", { exact: true }));
774-
expect(mockClient.setPowerLevel).toHaveBeenCalledTimes(1);
775-
expect(mockClient.setPowerLevel).toHaveBeenCalledWith(mockRoom.roomId, defaultMember.userId, changedPowerLevel);
776-
});
777-
});
778-
779711
describe("disambiguateDevices", () => {
780712
it("does not add ambiguous key to unique names", () => {
781713
const initialDevices = [

0 commit comments

Comments
 (0)