Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-15 20:54:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix tsc issues in right_panel and room component tests (#8078)

Browse Source 
* fix ts issues in SendMessageComposer-test

Signed-off-by: Kerry Archibald <kerrya@element.io>

* remove empty file

Signed-off-by: Kerry Archibald <kerrya@element.io>

* fix tsc issues in MessageComposerbUttons-test

Signed-off-by: Kerry Archibald <kerrya@element.io>

* fix the rest

Signed-off-by: Kerry Archibald <kerrya@element.io>

* bad autoformatter

Signed-off-by: Kerry Archibald <kerrya@element.io>

* tsc fixes for test/components/views/right_panel

Signed-off-by: Kerry Archibald <kerrya@element.io>
This commit is contained in:
Kerry 2022-03-21 10:03:03 +01:00 committed by GitHub
parent d7a3f39a3e
commit 026ca1ab64
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 125 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
test/components/views/right_panel/PinnedMessagesCard-test.tsx
View File

@ -14,12 +14,14 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
import React from "react"; import React, { ComponentProps } from "react";
import { mount } from "enzyme"; import { mount, ReactWrapper } from "enzyme";
import { mocked } from "jest-mock";
import { act } from "react-dom/test-utils"; import { act } from "react-dom/test-utils";
import { MatrixEvent } from "matrix-js-sdk/src/models/event"; import { MatrixEvent } from "matrix-js-sdk/src/models/event";
import { EventType, RelationType, MsgType } from "matrix-js-sdk/src/@types/event"; import { EventType, RelationType, MsgType } from "matrix-js-sdk/src/@types/event";
import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state"; import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state";
import { IEvent, Room, EventTimelineSet, IMinimalEvent } from "matrix-js-sdk/src/matrix";
import { import {
M_POLL_RESPONSE, M_POLL_RESPONSE,
M_POLL_END, M_POLL_END,
@ -32,37 +34,37 @@ import {
import "../../../skinned-sdk"; import "../../../skinned-sdk";
import { import {
stubClient, stubClient,
wrapInMatrixClientContext,
mkStubRoom, mkStubRoom,
mkEvent, mkEvent,
mkMessage, mkMessage,
} from "../../../test-utils"; } from "../../../test-utils";
import { MatrixClientPeg } from "../../../../src/MatrixClientPeg"; import { MatrixClientPeg } from "../../../../src/MatrixClientPeg";
import _PinnedMessagesCard from "../../../../src/components/views/right_panel/PinnedMessagesCard"; import PinnedMessagesCard from "../../../../src/components/views/right_panel/PinnedMessagesCard";
import PinnedEventTile from "../../../../src/components/views/rooms/PinnedEventTile"; import PinnedEventTile from "../../../../src/components/views/rooms/PinnedEventTile";
import MPollBody from "../../../../src/components/views/messages/MPollBody.tsx"; import MPollBody from "../../../../src/components/views/messages/MPollBody";
import MatrixClientContext from "../../../../src/contexts/MatrixClientContext";
const PinnedMessagesCard = wrapInMatrixClientContext(_PinnedMessagesCard);
describe("<PinnedMessagesCard />", () => { describe("<PinnedMessagesCard />", () => {
stubClient(); stubClient();
const cli = MatrixClientPeg.get(); const cli = mocked(MatrixClientPeg.get());
cli.getUserId.mockReturnValue("@alice:example.org"); cli.getUserId.mockReturnValue("@alice:example.org");
cli.setRoomAccountData = () => {}; cli.setRoomAccountData.mockReturnValue(undefined);
cli.relations = jest.fn().mockResolvedValue({ events: [] }); cli.relations.mockResolvedValue({ originalEvent: {} as unknown as MatrixEvent, events: [] });
const mkRoom = (localPins: MatrixEvent[], nonLocalPins: MatrixEvent[]): Room => { const mkRoom = (localPins: MatrixEvent[], nonLocalPins: MatrixEvent[]): Room => {
const room = mkStubRoom("!room:example.org"); const room = mkStubRoom("!room:example.org", 'room', cli);
// Deferred since we may be adding or removing pins later // Deferred since we may be adding or removing pins later
const pins = () => [...localPins, ...nonLocalPins]; const pins = () => [...localPins, ...nonLocalPins];
// Insert pin IDs into room state // Insert pin IDs into room state
room.currentState.getStateEvents.mockImplementation(() => mkEvent({ mocked(room.currentState).getStateEvents.mockImplementation(() => mkEvent({
event: true, event: true,
type: EventType.RoomPinnedEvents, type: EventType.RoomPinnedEvents,
content: { content: {
pinned: pins().map(e => e.getId()), pinned: pins().map(e => e.getId()),
}, },
user: '@user:example.org',
room: '!room:example.org',
})); }));
// Insert local pins into local timeline set // Insert local pins into local timeline set
@ -70,18 +72,24 @@ describe("<PinnedMessagesCard />", () => {
getTimelineForEvent: () => ({ getTimelineForEvent: () => ({
getEvents: () => localPins, getEvents: () => localPins,
}), }),
}); } as unknown as EventTimelineSet);
// Return all pins over fetchRoomEvent // Return all pins over fetchRoomEvent
cli.fetchRoomEvent = (roomId, eventId) => pins().find(e => e.getId() === eventId)?.event; cli.fetchRoomEvent.mockImplementation((roomId, eventId) => {
const event = pins().find(e => e.getId() === eventId)?.event;
return Promise.resolve(event as IMinimalEvent);
});
return room; return room;
}; };
const mountPins = async (room: Room): ReactWrapper => { const mountPins = async (room: Room): Promise<ReactWrapper<ComponentProps<typeof PinnedMessagesCard>>> => {
let pins; let pins;
await act(async () => { await act(async () => {
pins = mount(<PinnedMessagesCard room={room} onClose={() => {}} />); pins = mount(<PinnedMessagesCard room={room} onClose={jest.fn()} />, {
wrappingComponent: MatrixClientContext.Provider,
wrappingComponentProps: { value: cli },
});
// Wait a tick for state updates // Wait a tick for state updates
await new Promise(resolve => setImmediate(resolve)); await new Promise(resolve => setImmediate(resolve));
}); });
@ -90,13 +98,14 @@ describe("<PinnedMessagesCard />", () => {
return pins; return pins;
}; };
const emitPinUpdates = async (pins: ReactWrapper) => { const emitPinUpdates = async (pins: ReactWrapper<ComponentProps<typeof PinnedMessagesCard>>) => {
const room = pins.props().room; const room = pins.props().room;
const pinListener = room.currentState.on.mock.calls const pinListener = mocked(room.currentState).on.mock.calls
.find(([eventName, listener]) => eventName === RoomStateEvent.Events)[1]; .find(([eventName, listener]) => eventName === RoomStateEvent.Events)[1];
await act(async () => { await act(async () => {
// Emit the update // Emit the update
// @ts-ignore what is going on here?
pinListener(room.currentState.getStateEvents()); pinListener(room.currentState.getStateEvents());
// Wait a tick for state updates // Wait a tick for state updates
await new Promise(resolve => setImmediate(resolve)); await new Promise(resolve => setImmediate(resolve));
@ -159,7 +168,9 @@ describe("<PinnedMessagesCard />", () => {
event: true, event: true,
type: EventType.RoomMessage, type: EventType.RoomMessage,
content: {}, content: {},
unsigned: { redacted_because: {} }, unsigned: { redacted_because: {} as unknown as IEvent },
room: "!room:example.org",
user: "@alice:example.org",
}); });
const pins = await mountPins(mkRoom([pin], [])); const pins = await mountPins(mkRoom([pin], []));
@ -172,7 +183,9 @@ describe("<PinnedMessagesCard />", () => {
event: true, event: true,
type: EventType.RoomMessage, type: EventType.RoomMessage,
content: {}, content: {},
unsigned: { redacted_because: {} }, unsigned: { redacted_because: {} as unknown as IEvent },
room: "!room:example.org",
user: "@alice:example.org",
}); });
const pins = await mountPins(mkRoom([], [pin])); const pins = await mountPins(mkRoom([], [pin]));
@ -180,25 +193,27 @@ describe("<PinnedMessagesCard />", () => {
}); });
it("accounts for edits", async () => { it("accounts for edits", async () => {
cli.relations.mockResolvedValue({ const messageEvent = mkEvent({
events: [mkEvent({ event: true,
event: true, type: EventType.RoomMessage,
type: EventType.RoomMessage, room: "!room:example.org",
room: "!room:example.org", user: "@alice:example.org",
user: "@alice:example.org", content: {
content: { "msgtype": MsgType.Text,
"msgtype": MsgType.Text, "body": " * First pinned message, edited",
"body": " * First pinned message, edited", "m.new_content": {
"m.new_content": { msgtype: MsgType.Text,
msgtype: MsgType.Text, body: "First pinned message, edited",
body: "First pinned message, edited",
},
"m.relates_to": {
rel_type: RelationType.Replace,
event_id: pin1.getId(),
},
}, },
})], "m.relates_to": {
rel_type: RelationType.Replace,
event_id: pin1.getId(),
},
},
});
cli.relations.mockResolvedValue({
originalEvent: pin1,
events: [messageEvent],
}); });
const pins = await mountPins(mkRoom([], [pin1])); const pins = await mountPins(mkRoom([], [pin1]));
@ -224,7 +239,7 @@ describe("<PinnedMessagesCard />", () => {
...PollResponseEvent.from([answers[option].id], poll.getId()).serialize(), ...PollResponseEvent.from([answers[option].id], poll.getId()).serialize(),
event: true, event: true,
room: "!room:example.org", room: "!room:example.org",
user, user: user as string,
})); }));
const end = mkEvent({ const end = mkEvent({
...PollEndEvent.from(poll.getId(), "Closing the poll").serialize(), ...PollEndEvent.from(poll.getId(), "Closing the poll").serialize(),
@ -234,19 +249,22 @@ describe("<PinnedMessagesCard />", () => {
}); });
// Make the responses available // Make the responses available
cli.relations.mockImplementation((roomId, eventId, relationType, eventType, { from }) => { cli.relations.mockImplementation(async (roomId, eventId, relationType, eventType, { from }) => {
if (eventId === poll.getId() && relationType === RelationType.Reference) { if (eventId === poll.getId() && relationType === RelationType.Reference) {
switch (eventType) { switch (eventType) {
case M_POLL_RESPONSE.name: case M_POLL_RESPONSE.name:
// Paginate the results, for added challenge // Paginate the results, for added challenge
return (from === "page2") ? return (from === "page2") ?
{ events: responses.slice(2) } : { originalEvent: poll, events: responses.slice(2) } :
{ events: responses.slice(0, 2), nextBatch: "page2" }; { originalEvent: poll, events: responses.slice(0, 2), nextBatch: "page2" };
case M_POLL_END.name: case M_POLL_END.name:
return { events: [end] }; return { originalEvent: null, events: [end] };
} }
} }
return { events: [] }; // type does not allow originalEvent to be falsy
// but code seems to
// so still test that
return { originalEvent: undefined as unknown as MatrixEvent, events: [] };
}); });
const pins = await mountPins(mkRoom([], [poll])); const pins = await mountPins(mkRoom([], [poll]));

33
test/components/views/right_panel/UserInfo-test.tsx
View File

@ -16,8 +16,9 @@ limitations under the License.
import React from 'react'; import React from 'react';
import { mount } from 'enzyme'; import { mount } from 'enzyme';
import { mocked } from 'jest-mock';
import { act } from "react-dom/test-utils"; import { act } from "react-dom/test-utils";
import { Room, User } from 'matrix-js-sdk/src/matrix'; import { Room, User, MatrixClient } from 'matrix-js-sdk/src/matrix';
import { Phase, VerificationRequest } from 'matrix-js-sdk/src/crypto/verification/request/VerificationRequest'; import { Phase, VerificationRequest } from 'matrix-js-sdk/src/crypto/verification/request/VerificationRequest';
import "../../../skinned-sdk"; import "../../../skinned-sdk";
@ -46,13 +47,7 @@ describe('<UserInfo />', () => {
const defaultUserId = '@test:test'; const defaultUserId = '@test:test';
const defaultUser = new User(defaultUserId); const defaultUser = new User(defaultUserId);
const defaultProps = { const mockClient = mocked({
user: defaultUser,
phase: RightPanelPhases.RoomMemberInfo,
onClose: jest.fn(),
};
const mockClient = {
getUser: jest.fn(), getUser: jest.fn(),
isGuest: jest.fn().mockReturnValue(false), isGuest: jest.fn().mockReturnValue(false),
isUserIgnored: jest.fn(), isUserIgnored: jest.fn(),
@ -67,7 +62,7 @@ describe('<UserInfo />', () => {
currentState: { currentState: {
on: jest.fn(), on: jest.fn(),
}, },
}; } as unknown as MatrixClient);
const verificationRequest = { const verificationRequest = {
pending: true, on: jest.fn(), phase: Phase.Ready, pending: true, on: jest.fn(), phase: Phase.Ready,
@ -75,17 +70,27 @@ describe('<UserInfo />', () => {
otherPartySupportsMethod: jest.fn(), otherPartySupportsMethod: jest.fn(),
} as unknown as VerificationRequest; } as unknown as VerificationRequest;
const getComponent = (props = {}) => mount(<UserInfo {...defaultProps} {...props} />, { const defaultProps = {
wrappingComponent: MatrixClientContext.Provider, user: defaultUser,
wrappingComponentProps: { value: mockClient }, // idk what is wrong with this type
}); phase: RightPanelPhases.RoomMemberInfo as RightPanelPhases.RoomMemberInfo,
onClose: jest.fn(),
};
const getComponent = (props = {}) => mount(
<UserInfo {...defaultProps} {...props} />,
{
wrappingComponent: MatrixClientContext.Provider,
wrappingComponentProps: { value: mockClient },
},
);
beforeAll(() => { beforeAll(() => {
jest.spyOn(MatrixClientPeg, 'get').mockReturnValue(mockClient); jest.spyOn(MatrixClientPeg, 'get').mockReturnValue(mockClient);
}); });
beforeEach(() => { beforeEach(() => {
mockClient.getUser.mockClear().mockResolvedValue(undefined); mockClient.getUser.mockClear().mockReturnValue({} as unknown as User);
}); });
it('closes on close button click', () => { it('closes on close button click', () => {

17
test/components/views/rooms/MemberList-test.tsx
View File

@ -28,13 +28,14 @@ import * as TestUtils from '../../../test-utils';
import { compare } from "../../../../src/utils/strings"; import { compare } from "../../../../src/utils/strings";
import MemberList from "../../../../src/components/views/rooms/MemberList"; import MemberList from "../../../../src/components/views/rooms/MemberList";
import MemberTile from '../../../../src/components/views/rooms/MemberTile'; import MemberTile from '../../../../src/components/views/rooms/MemberTile';
import MatrixClientContext from "../../../../src/contexts/MatrixClientContext";
function generateRoomId() { function generateRoomId() {
return '!' + Math.random().toString().slice(2, 10) + ':domain'; return '!' + Math.random().toString().slice(2, 10) + ':domain';
} }
describe('MemberList', () => { describe('MemberList', () => {
function createRoom(opts) { function createRoom(opts = {}) {
const room = new Room(generateRoomId(), null, client.getUserId()); const room = new Room(generateRoomId(), null, client.getUserId());
if (opts) { if (opts) {
Object.assign(room, opts); Object.assign(room, opts);
@ -114,16 +115,20 @@ describe('MemberList', () => {
memberListRoom.currentState.members[member.userId] = member; memberListRoom.currentState.members[member.userId] = member;
} }
const WrappedMemberList = TestUtils.wrapInMatrixClientContext(MemberList);
const gatherWrappedRef = (r) => { const gatherWrappedRef = (r) => {
memberList = r; memberList = r;
}; };
root = ReactDOM.render( root = ReactDOM.render(
( (
<WrappedMemberList <MatrixClientContext.Provider value={client}>
roomId={memberListRoom.roomId} <MemberList
wrappedRef={gatherWrappedRef} searchQuery=""
/> onClose={jest.fn()}
onSearchQueryChanged={jest.fn()}
roomId={memberListRoom.roomId}
ref={gatherWrappedRef}
/>
</MatrixClientContext.Provider>
), ),
parentDiv, parentDiv,
); );

32
test/components/views/rooms/MessageComposer-test.tsx
View File

@ -25,6 +25,9 @@ import MessageComposer from "../../../../src/components/views/rooms/MessageCompo
import MatrixClientContext from "../../../../src/contexts/MatrixClientContext"; import MatrixClientContext from "../../../../src/contexts/MatrixClientContext";
import { MatrixClientPeg } from "../../../../src/MatrixClientPeg"; import { MatrixClientPeg } from "../../../../src/MatrixClientPeg";
import RoomContext from "../../../../src/contexts/RoomContext"; import RoomContext from "../../../../src/contexts/RoomContext";
import { IRoomState } from "../../../../src/components/structures/RoomView";
import ResizeNotifier from "../../../../src/utils/ResizeNotifier";
import { RoomPermalinkCreator } from "../../../../src/utils/permalinks/Permalinks";
describe("MessageComposer", () => { describe("MessageComposer", () => {
stubClient(); stubClient();
@ -32,18 +35,14 @@ describe("MessageComposer", () => {
const room = mkStubRoom("!roomId:server", "Room 1", cli); const room = mkStubRoom("!roomId:server", "Room 1", cli);
it("Renders a SendMessageComposer and MessageComposerButtons by default", () => { it("Renders a SendMessageComposer and MessageComposerButtons by default", () => {
const wrapper = wrapAndRender(( const wrapper = wrapAndRender({ room });
<MessageComposer room={room} resizeNotifier={jest.fn()} permalinkCreator={jest.fn()} />
));
expect(wrapper.find("SendMessageComposer")).toHaveLength(1); expect(wrapper.find("SendMessageComposer")).toHaveLength(1);
expect(wrapper.find("MessageComposerButtons")).toHaveLength(1); expect(wrapper.find("MessageComposerButtons")).toHaveLength(1);
}); });
it("Does not render a SendMessageComposer or MessageComposerButtons when user has no permission", () => { it("Does not render a SendMessageComposer or MessageComposerButtons when user has no permission", () => {
const wrapper = wrapAndRender(( const wrapper = wrapAndRender({ room }, false);
<MessageComposer room={room} resizeNotifier={jest.fn()} permalinkCreator={jest.fn()} />
), false);
expect(wrapper.find("SendMessageComposer")).toHaveLength(0); expect(wrapper.find("SendMessageComposer")).toHaveLength(0);
expect(wrapper.find("MessageComposerButtons")).toHaveLength(0); expect(wrapper.find("MessageComposerButtons")).toHaveLength(0);
@ -51,9 +50,7 @@ describe("MessageComposer", () => {
}); });
it("Does not render a SendMessageComposer or MessageComposerButtons when room is tombstoned", () => { it("Does not render a SendMessageComposer or MessageComposerButtons when room is tombstoned", () => {
const wrapper = wrapAndRender(( const wrapper = wrapAndRender({ room }, true, mkEvent({
<MessageComposer room={room} resizeNotifier={jest.fn()} permalinkCreator={jest.fn()} />
), true, mkEvent({
event: true, event: true,
type: "m.room.tombstone", type: "m.room.tombstone",
room: room.roomId, room: room.roomId,
@ -69,7 +66,7 @@ describe("MessageComposer", () => {
}); });
}); });
function wrapAndRender(component: React.ReactElement, canSendMessages = true, tombstone?: MatrixEvent): ReactWrapper { function wrapAndRender(props = {}, canSendMessages = true, tombstone?: MatrixEvent): ReactWrapper {
const mockClient = MatrixClientPeg.get(); const mockClient = MatrixClientPeg.get();
const roomId = "myroomid"; const roomId = "myroomid";
const room: any = { const room: any = {
@ -80,10 +77,21 @@ function wrapAndRender(component: React.ReactElement, canSendMessages = true, to
return new RoomMember(roomId, userId); return new RoomMember(roomId, userId);
}, },
}; };
const roomState = {
room, canSendMessages, tombstone,
} as unknown as IRoomState;
const defaultProps = {
room,
resizeNotifier: new ResizeNotifier(),
permalinkCreator: new RoomPermalinkCreator(room),
};
return mount( return mount(
<MatrixClientContext.Provider value={mockClient}> <MatrixClientContext.Provider value={mockClient}>
<RoomContext.Provider value={{ room, canSendMessages, tombstone }}> <RoomContext.Provider value={roomState}>
{ component } <MessageComposer {...defaultProps} {...props} />
</RoomContext.Provider> </RoomContext.Provider>
</MatrixClientContext.Provider>, </MatrixClientContext.Provider>,
); );

10
test/components/views/rooms/MessageComposerButtons-test.tsx
View File

@ -19,7 +19,6 @@ import { mount, ReactWrapper } from "enzyme";
import { Room } from "matrix-js-sdk/src/models/room"; import { Room } from "matrix-js-sdk/src/models/room";
import { RoomMember } from "matrix-js-sdk/src/models/room-member"; import { RoomMember } from "matrix-js-sdk/src/models/room-member";
import * as TestUtils from "../../../test-utils";
import sdk from "../../../skinned-sdk"; import sdk from "../../../skinned-sdk";
import MatrixClientContext from "../../../../src/contexts/MatrixClientContext"; import MatrixClientContext from "../../../../src/contexts/MatrixClientContext";
import { Layout } from "../../../../src/settings/enums/Layout"; import { Layout } from "../../../../src/settings/enums/Layout";
@ -28,10 +27,7 @@ import { createTestClient } from "../../../test-utils";
import { IRoomState } from "../../../../src/components/structures/RoomView"; import { IRoomState } from "../../../../src/components/structures/RoomView";
import { MatrixClientPeg } from "../../../../src/MatrixClientPeg"; import { MatrixClientPeg } from "../../../../src/MatrixClientPeg";
const _MessageComposerButtons = sdk.getComponent("views.rooms.MessageComposerButtons"); const MessageComposerButtons = sdk.getComponent("views.rooms.MessageComposerButtons");
const MessageComposerButtons = TestUtils.wrapInMatrixClientContext(
_MessageComposerButtons,
);
describe("MessageComposerButtons", () => { describe("MessageComposerButtons", () => {
it("Renders emoji and upload buttons in wide mode", () => { it("Renders emoji and upload buttons in wide mode", () => {
@ -172,7 +168,8 @@ describe("MessageComposerButtons", () => {
}); });
function wrapAndRender(component: React.ReactElement, narrow: boolean): ReactWrapper { function wrapAndRender(component: React.ReactElement, narrow: boolean): ReactWrapper {
const mockClient = MatrixClientPeg.matrixClient = createTestClient(); const mockClient = createTestClient();
jest.spyOn(MatrixClientPeg, 'get').mockReturnValue(mockClient);
const roomId = "myroomid"; const roomId = "myroomid";
const mockRoom: any = { const mockRoom: any = {
currentState: undefined, currentState: undefined,
@ -202,7 +199,6 @@ function createRoomState(room: Room, narrow: boolean): IRoomState {
shouldPeek: true, shouldPeek: true,
membersLoaded: false, membersLoaded: false,
numUnreadMessages: 0, numUnreadMessages: 0,
searching: false,
guestsCanJoin: false, guestsCanJoin: false,
canPeek: false, canPeek: false,
showApps: false, showApps: false,

5
test/components/views/rooms/RoomHeader-test.tsx
View File

@ -9,7 +9,6 @@ import DMRoomMap from '../../../../src/utils/DMRoomMap';
import RoomHeader from '../../../../src/components/views/rooms/RoomHeader'; import RoomHeader from '../../../../src/components/views/rooms/RoomHeader';
import { SearchScope } from '../../../../src/components/views/rooms/SearchBar'; import { SearchScope } from '../../../../src/components/views/rooms/SearchBar';
import { E2EStatus } from '../../../../src/utils/ShieldUtils'; import { E2EStatus } from '../../../../src/utils/ShieldUtils';
import { PlaceCallType } from '../../../../src/CallHandler';
import { mkEvent } from '../../../test-utils'; import { mkEvent } from '../../../test-utils';
import { IRoomState } from "../../../../src/components/structures/RoomView"; import { IRoomState } from "../../../../src/components/structures/RoomView";
import RoomContext from '../../../../src/contexts/RoomContext'; import RoomContext from '../../../../src/contexts/RoomContext';
@ -173,13 +172,13 @@ function createRoom(info: IRoomCreationInfo) {
function render(room: Room, roomContext?: Partial<IRoomState>): ReactWrapper { function render(room: Room, roomContext?: Partial<IRoomState>): ReactWrapper {
return mount(( return mount((
<RoomContext.Provider value={{ ...roomContext, room }}> <RoomContext.Provider value={{ ...roomContext, room } as IRoomState}>
<RoomHeader <RoomHeader
room={room} room={room}
inRoom={true} inRoom={true}
onSearchClick={() => {}} onSearchClick={() => {}}
onForgetClick={() => {}} onForgetClick={() => {}}
onCallPlaced={(_type: PlaceCallType) => {}} onCallPlaced={(_type) => { }}
onAppsClick={() => {}} onAppsClick={() => {}}
e2eStatus={E2EStatus.Normal} e2eStatus={E2EStatus.Normal}
appsShown={true} appsShown={true}

1
test/components/views/rooms/SearchResultTile-test.tsx
View File

@ -81,6 +81,7 @@ describe("SearchResultTile", () => {
const tiles = wrapper.find(EventTile); const tiles = wrapper.find(EventTile);
expect(tiles.length).toEqual(2); expect(tiles.length).toEqual(2);
expect(tiles.at(0).prop("mxEvent").getId()).toBe("$1:server"); expect(tiles.at(0).prop("mxEvent").getId()).toBe("$1:server");
// @ts-ignore accessing private property
expect(tiles.at(0).prop("callEventGrouper").events.size).toBe(2); expect(tiles.at(0).prop("callEventGrouper").events.size).toBe(2);
expect(tiles.at(1).prop("mxEvent").getId()).toBe("$144429830826TWwbB:localhost"); expect(tiles.at(1).prop("mxEvent").getId()).toBe("$144429830826TWwbB:localhost");
}); });

2
test/test-utils/test-utils.ts
View File

@ -133,7 +133,9 @@ export function createTestClient(): MatrixClient {
setPusher: jest.fn().mockResolvedValue(undefined), setPusher: jest.fn().mockResolvedValue(undefined),
setPushRuleEnabled: jest.fn().mockResolvedValue(undefined), setPushRuleEnabled: jest.fn().mockResolvedValue(undefined),
setPushRuleActions: jest.fn().mockResolvedValue(undefined), setPushRuleActions: jest.fn().mockResolvedValue(undefined),
relations: jest.fn().mockRejectedValue(undefined),
isCryptoEnabled: jest.fn().mockReturnValue(false), isCryptoEnabled: jest.fn().mockReturnValue(false),
fetchRoomEvent: jest.fn(),
} as unknown as MatrixClient; } as unknown as MatrixClient;
} }

7
tsconfig.json
View File

@ -21,7 +21,7 @@
}, },
"include": [ "include": [
"./src/**/*.ts", "./src/**/*.ts",
"./src/**/*.tsx" , "./src/**/*.tsx",
"./test/test-utils/**/*.ts", "./test/test-utils/**/*.ts",
"./test/test-utils/**/*.tsx", "./test/test-utils/**/*.tsx",
"./test/utils/**/*.ts", "./test/utils/**/*.ts",
@ -32,7 +32,10 @@
"./test/components/structures/**/*.tsx", "./test/components/structures/**/*.tsx",
"./test/components/views/context_menus/**/*.ts", "./test/components/views/context_menus/**/*.ts",
"./test/components/views/context_menus/**/*.tsx", "./test/components/views/context_menus/**/*.tsx",
"./test/components/views/rooms/SendMessageComposer-test.tsx" , "./test/components/views/rooms/**/*.tsx",
"./test/components/views/rooms/**/*.ts",
"./test/components/views/right_panel/**/*.tsx",
"./test/components/views/right_panel/**/*.ts",
], ],
"exclude": [ "exclude": [
"./test/end-to-end-tests/" "./test/end-to-end-tests/"