imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Eliminate the use of MatrixClientPeg in utils (#10910)

Browse source
This commit is contained in:
Michael Telatynski 2023-05-23 16:24:12 +01:00 • committed by GitHub
parent a0c2676c38
commit 30429df948
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
108 changed files with 409 additions and 325 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/components/views/rooms/EditMessageComposer-test.tsx
View file

@ -97,7 +97,7 @@ describe("<EditMessageComposer/>", () => {
userEvent.setup();
DMRoomMap.makeShared();
DMRoomMap.makeShared(mockClient);
jest.spyOn(Autocompleter.prototype, "getCompletions").mockResolvedValue([
{

2
test/components/views/rooms/NewRoomIntro-test.tsx
View file

@ -47,7 +47,7 @@ describe("NewRoomIntro", () => {
beforeAll(() => {
client = stubClient();
DMRoomMap.makeShared();
DMRoomMap.makeShared(client);
});
describe("for a DM Room", () => {

4
test/components/views/rooms/RoomHeader-test.tsx
View file

@ -112,7 +112,7 @@ describe("RoomHeader", () => {
[MediaDeviceKindEnum.AudioOutput]: [],
});
DMRoomMap.makeShared();
DMRoomMap.makeShared(client);
jest.spyOn(DMRoomMap.shared(), "getUserIdForRoomId").mockReturnValue(carol.userId);
});
@ -761,7 +761,7 @@ function createRoom(info: IRoomCreationInfo) {
};
}
DMRoomMap.makeShared().start();
DMRoomMap.makeShared(client).start();
const room = new Room(roomId, client, userId, {
pendingEventOrdering: PendingEventOrdering.Detached,

5
test/components/views/rooms/RoomPreviewBar-test.tsx
View file

@ -33,8 +33,9 @@ jest.mock("../../../../src/IdentityAuthClient", () => {
jest.useRealTimers();
const createRoom = (roomId: string, userId: string): Room => {
const newRoom = new Room(roomId, MatrixClientPeg.get(), userId, {});
DMRoomMap.makeShared().start();
const cli = MatrixClientPeg.get();
const newRoom = new Room(roomId, cli, userId, {});
DMRoomMap.makeShared(cli).start();
return newRoom;
};

2
test/components/views/rooms/RoomPreviewCard-test.tsx
View file

@ -42,7 +42,7 @@ describe("RoomPreviewCard", () => {
stubClient();
client = mocked(MatrixClientPeg.get());
client.getUserId.mockReturnValue("@alice:example.org");
DMRoomMap.makeShared();
DMRoomMap.makeShared(client);
room = new Room("!1:example.org", client, "@alice:example.org", {
pendingEventOrdering: PendingEventOrdering.Detached,

2
test/components/views/rooms/RoomTile-test.tsx
View file

@ -90,7 +90,7 @@ describe("RoomTile", () => {
client = mocked(stubClient());
sdkContext.client = client;
DMRoomMap.makeShared();
DMRoomMap.makeShared(client);
room = new Room("!1:example.org", client, "@alice:example.org", {
pendingEventOrdering: PendingEventOrdering.Detached,