mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-26 03:05:51 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #11457 from matrix-org/backport-11450-to-staging

Browse source 
[Backport staging] Avoid importing mkEvent from matrix-js-sdk/spec since that is not in the package
This commit is contained in:
Andy Balaam 2023-08-23 11:38:34 +01:00 committed by GitHub
commit 3643b70ea5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
test/components/views/dialogs/RoomSettingsDialog-test.tsx
View file

@ -16,7 +16,6 @@ limitations under the License.
import React from "react"; import React from "react";
import { fireEvent, render, screen } from "@testing-library/react"; import { fireEvent, render, screen } from "@testing-library/react";
import { mkEvent } from "matrix-js-sdk/spec/test-utils/test-utils";
import { import {
EventTimeline, EventTimeline,
EventType, EventType,
@ -133,7 +132,7 @@ describe("<RoomSettingsDialog />", () => {
jest.spyOn(room, "getJoinRule").mockReturnValue(JoinRule.Invite); jest.spyOn(room, "getJoinRule").mockReturnValue(JoinRule.Invite);
mockClient.emit( mockClient.emit(
RoomStateEvent.Events, RoomStateEvent.Events,
new MatrixEvent(mkEvent({ content: {}, type: EventType.RoomJoinRules })), new MatrixEvent({ content: {}, type: EventType.RoomJoinRules }),
room.getLiveTimeline().getState(EventTimeline.FORWARDS)!, room.getLiveTimeline().getState(EventTimeline.FORWARDS)!,
null, null,
); );