matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-28 15:22:05 +03:00
Code Activity

Merge branch 'develop' into andybalaam/stas-demydiuk-membership-type3

Browse Source
This commit is contained in:
Andy Balaam
2024-03-20 17:25:23 +00:00
parent 5cd7743fcb 2cbf92860b
commit d7bdbee8d2
124 changed files with 2399 additions and 1052 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test/models/Call-test.ts
View File

@ -17,7 +17,15 @@ limitations under the License.
import EventEmitter from "events";
import { mocked } from "jest-mock";
import { waitFor } from "@testing-library/react";
import { RoomType, Room, RoomEvent, MatrixEvent, RoomStateEvent, PendingEventOrdering } from "matrix-js-sdk/src/matrix";
import {
RoomType,
Room,
RoomEvent,
MatrixEvent,
RoomStateEvent,
PendingEventOrdering,
IContent,
} from "matrix-js-sdk/src/matrix";
import { KnownMembership } from "matrix-js-sdk/src/types";
import { Widget } from "matrix-widget-api";
// eslint-disable-next-line no-restricted-imports
@ -117,7 +125,7 @@ const setUpClientRoomAndStores = (): {
room: roomId,
user: alice.userId,
skey: stateKey,
content,
content: content as IContent,
});
room.addLiveEvents([event]);
return { event_id: event.getId()! };