matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-25 05:23:13 +03:00
Code Activity

fix tests

Browse Source 
Signed-off-by: Timo K <toger5@hotmail.de>
This commit is contained in:
Timo K
2025-10-07 17:11:21 +02:00
parent 65a346146b
commit e9dafb5735
4 changed files with 41 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
spec/unit/matrixrtc/MatrixRTCSessionManager.spec.ts
View File

@@ -23,9 +23,9 @@ import { logger } from "../../../src/logger";
describe("MatrixRTCSessionManager", () => { describe("MatrixRTCSessionManager", () => {
let client: MatrixClient; let client: MatrixClient;
beforeEach(() => { beforeEach(async () => {
client = new MatrixClient({ baseUrl: "base_url" }); client = new MatrixClient({ baseUrl: "base_url" });
client.matrixRTC.start(); await client.matrixRTC.start();
}); });
afterEach(() => { afterEach(() => {
@@ -33,15 +33,20 @@ describe("MatrixRTCSessionManager", () => {
client.matrixRTC.stop(); client.matrixRTC.stop();
}); });
it("Fires event when session starts", () => { it("Fires event when session starts", async () => {
const onStarted = jest.fn(); const onStarted = jest.fn();
client.matrixRTC.on(MatrixRTCSessionManagerEvents.SessionStarted, onStarted); const { promise, resolve } = Promise.withResolvers<void>();
client.matrixRTC.on(MatrixRTCSessionManagerEvents.SessionStarted, (...v) => {
onStarted(...v);
resolve();
});
try { try {
const room1 = makeMockRoom([membershipTemplate]); const room1 = makeMockRoom([membershipTemplate]);
jest.spyOn(client, "getRooms").mockReturnValue([room1]); jest.spyOn(client, "getRooms").mockReturnValue([room1]);
client.emit(ClientEvent.Room, room1); client.emit(ClientEvent.Room, room1);
await promise;
expect(onStarted).toHaveBeenCalledWith(room1.roomId, client.matrixRTC.getActiveRoomSession(room1)); expect(onStarted).toHaveBeenCalledWith(room1.roomId, client.matrixRTC.getActiveRoomSession(room1));
} finally { } finally {
client.matrixRTC.off(MatrixRTCSessionManagerEvents.SessionStarted, onStarted); client.matrixRTC.off(MatrixRTCSessionManagerEvents.SessionStarted, onStarted);
@@ -63,34 +68,48 @@ describe("MatrixRTCSessionManager", () => {
} }
}); });
it("Fires event when session ends", () => { it("Fires event when session ends", async () => {
const onEnded = jest.fn(); const onEnded = jest.fn();
client.matrixRTC.on(MatrixRTCSessionManagerEvents.SessionEnded, onEnded); const { promise: endPromise, resolve: rEnd } = Promise.withResolvers();
client.matrixRTC.once(MatrixRTCSessionManagerEvents.SessionEnded, onEnded);
const { promise: startPromise, resolve: rStart } = Promise.withResolvers();
client.matrixRTC.once(MatrixRTCSessionManagerEvents.SessionEnded, rEnd);
client.matrixRTC.once(MatrixRTCSessionManagerEvents.SessionStarted, rStart);
const room1 = makeMockRoom([membershipTemplate]); const room1 = makeMockRoom([membershipTemplate]);
jest.spyOn(client, "getRooms").mockReturnValue([room1]); jest.spyOn(client, "getRooms").mockReturnValue([room1]);
jest.spyOn(client, "getRoom").mockReturnValue(room1); jest.spyOn(client, "getRoom").mockReturnValue(room1);
client.emit(ClientEvent.Room, room1); client.emit(ClientEvent.Room, room1);
await startPromise;
mockRoomState(room1, [{ user_id: membershipTemplate.user_id }]); mockRoomState(room1, [{ user_id: membershipTemplate.user_id }]);
const roomState = room1.getLiveTimeline().getState(EventTimeline.FORWARDS)!; const roomState = room1.getLiveTimeline().getState(EventTimeline.FORWARDS)!;
const membEvent = roomState.getStateEvents("org.matrix.msc3401.call.member")[0]; const membEvent = roomState.getStateEvents("org.matrix.msc3401.call.member")[0];
client.emit(RoomStateEvent.Events, membEvent, roomState, null); client.emit(RoomStateEvent.Events, membEvent, roomState, null);
await endPromise;
expect(onEnded).toHaveBeenCalledWith(room1.roomId, client.matrixRTC.getActiveRoomSession(room1)); expect(onEnded).toHaveBeenCalledWith(room1.roomId, client.matrixRTC.getActiveRoomSession(room1));
}); });
it("Fires correctly with for with custom sessionDescription", () => { it("Fires correctly with for with custom sessionDescription", async () => {
const onStarted = jest.fn(); const onStarted = jest.fn();
const onEnded = jest.fn(); const onEnded = jest.fn();
// create a session manager with a custom session description // create a session manager with a custom session description
const sessionManager = new MatrixRTCSessionManager(logger, client, { id: "test", application: "m.notCall" }); const sessionManager = new MatrixRTCSessionManager(logger, client, { id: "test", application: "m.notCall" });
// manually start the session manager (its not the default one started by the client) // manually start the session manager (its not the default one started by the client)
sessionManager.start(); await sessionManager.start();
sessionManager.on(MatrixRTCSessionManagerEvents.SessionEnded, onEnded); const { promise: startPromise, resolve: rStart } = Promise.withResolvers<void>();
sessionManager.on(MatrixRTCSessionManagerEvents.SessionStarted, onStarted); const { promise: endPromise, resolve: rEnd } = Promise.withResolvers<void>();
sessionManager.on(MatrixRTCSessionManagerEvents.SessionEnded, (v) => {
onEnded(v);
rEnd();
});
sessionManager.on(MatrixRTCSessionManagerEvents.SessionStarted, (v) => {
onStarted(v);
rStart();
});
try { try {
const room1 = makeMockRoom([{ ...membershipTemplate, application: "m.other" }]); const room1 = makeMockRoom([{ ...membershipTemplate, application: "m.other" }]);
@@ -104,6 +123,7 @@ describe("MatrixRTCSessionManager", () => {
jest.spyOn(client, "getRooms").mockReturnValue([room1, room2]); jest.spyOn(client, "getRooms").mockReturnValue([room1, room2]);
client.emit(ClientEvent.Room, room2); client.emit(ClientEvent.Room, room2);
await startPromise;
expect(onStarted).toHaveBeenCalled(); expect(onStarted).toHaveBeenCalled();
onStarted.mockClear(); onStarted.mockClear();
@@ -113,6 +133,7 @@ describe("MatrixRTCSessionManager", () => {
const roomState = room2.getLiveTimeline().getState(EventTimeline.FORWARDS)!; const roomState = room2.getLiveTimeline().getState(EventTimeline.FORWARDS)!;
const membEvent = roomState.getStateEvents("org.matrix.msc3401.call.member")[0]; const membEvent = roomState.getStateEvents("org.matrix.msc3401.call.member")[0];
client.emit(RoomStateEvent.Events, membEvent, roomState, null); client.emit(RoomStateEvent.Events, membEvent, roomState, null);
await endPromise;
expect(onEnded).toHaveBeenCalled(); expect(onEnded).toHaveBeenCalled();
onEnded.mockClear(); onEnded.mockClear();

7
spec/unit/matrixrtc/MembershipManager.spec.ts
View File

@@ -33,6 +33,7 @@ import {
} from "../../../src/matrixrtc"; } from "../../../src/matrixrtc";
import { makeMockClient, makeMockRoom, membershipTemplate, mockCallMembership, type MockClient } from "./mocks"; import { makeMockClient, makeMockRoom, membershipTemplate, mockCallMembership, type MockClient } from "./mocks";
import { MembershipManager } from "../../../src/matrixrtc/MembershipManager.ts"; import { MembershipManager } from "../../../src/matrixrtc/MembershipManager.ts";
import { waitFor } from "../../test-utils/test-utils.ts";
/** /**
* Create a promise that will resolve once a mocked method is called. * Create a promise that will resolve once a mocked method is called.
@@ -923,18 +924,18 @@ describe("MembershipManager", () => {
}); });
}); });
it("Should prefix log with MembershipManager used", () => { it("Should prefix log with MembershipManager used", async () => {
const spy = jest.spyOn(console, "error");
const client = makeMockClient("@alice:example.org", "AAAAAAA"); const client = makeMockClient("@alice:example.org", "AAAAAAA");
const room = makeMockRoom([membershipTemplate]); const room = makeMockRoom([membershipTemplate]);
const membershipManager = new MembershipManager(undefined, room, client, callSession); const membershipManager = new MembershipManager(undefined, room, client, callSession);
const spy = jest.spyOn(console, "error");
// Double join // Double join
membershipManager.join([]); membershipManager.join([]);
membershipManager.join([]); membershipManager.join([]);
expect(spy).toHaveBeenCalled(); await waitFor(() => expect(spy).toHaveBeenCalled());
const logline: string = spy.mock.calls[0][0]; const logline: string = spy.mock.calls[0][0];
expect(logline.startsWith("[MembershipManager]")).toBe(true); expect(logline.startsWith("[MembershipManager]")).toBe(true);
}); });

4
spec/unit/matrixrtc/RoomKeyTransport.spec.ts
View File

@@ -31,7 +31,7 @@ describe("RoomKeyTransport", () => {
let mockLogger: Mocked<Logger>; let mockLogger: Mocked<Logger>;
const onCallEncryptionMock = jest.fn(); const onCallEncryptionMock = jest.fn();
beforeEach(() => { beforeEach(async () => {
onCallEncryptionMock.mockReset(); onCallEncryptionMock.mockReset();
mockLogger = { mockLogger = {
debug: jest.fn(), debug: jest.fn(),
@@ -50,7 +50,7 @@ describe("RoomKeyTransport", () => {
}; };
room = makeMockRoom([membershipTemplate]); room = makeMockRoom([membershipTemplate]);
client = new MatrixClient({ baseUrl: "base_url" }); client = new MatrixClient({ baseUrl: "base_url" });
client.matrixRTC.start(); await client.matrixRTC.start();
transport = new RoomKeyTransport(room, client, statistics, { transport = new RoomKeyTransport(room, client, statistics, {
getChild: jest.fn().mockReturnValue(mockLogger), getChild: jest.fn().mockReturnValue(mockLogger),
} as unknown as Mocked<Logger>); } as unknown as Mocked<Logger>);

4
src/matrixrtc/MatrixRTCSession.ts
View File

@@ -363,8 +363,8 @@ export class MatrixRTCSession extends TypedEventEmitter<
return eventData ? new MatrixEvent(eventData) : undefined; return eventData ? new MatrixEvent(eventData) : undefined;
}; };
const relatedEvent = relatedEventId const relatedEvent = relatedEventId
? room.findEventById(relatedEventId) ? (room.findEventById(relatedEventId) ?? (await getRelatedMatrixEvent()))
: await getRelatedMatrixEvent(); : undefined;
try { try {
membership = new CallMembership(memberEvent, relatedEvent); membership = new CallMembership(memberEvent, relatedEvent);