matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-07-30 04:23:07 +03:00
Code Activity

Merge branch 'develop' into robertlong/group-call

Browse Source
This commit is contained in:
Robin Townsend
2022-10-13 20:14:29 -04:00
parent d521f97411 c81d759334
commit 3c33c422e6
104 changed files with 6514 additions and 4382 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spec/unit/webrtc/call.spec.ts
View File

@ -44,7 +44,7 @@ import {
MockRTCRtpSender,
} from "../../test-utils/webrtc";
import { CallFeed } from "../../../src/webrtc/callFeed";
import { Callback, EventType, IContent, ISendEventResponse, MatrixEvent, Room } from "../../../src";
import { EventType, IContent, ISendEventResponse, MatrixEvent, Room } from "../../../src";
const FAKE_ROOM_ID = "!foo:bar";
const CALL_LIFETIME = 60000;
@ -106,7 +106,7 @@ describe('Call', function() {
let prevDocument: Document;
let prevWindow: Window & typeof globalThis;
// We retain a reference to this in the correct Mock type
let mockSendEvent: jest.Mock<Promise<ISendEventResponse>, [string, string, IContent, string, Callback<any>]>;
let mockSendEvent: jest.Mock<Promise<ISendEventResponse>, [string, string, IContent, string]>;
const errorListener = () => {};

5
spec/unit/webrtc/groupCall.spec.ts
View File

@ -1123,10 +1123,7 @@ describe('Group Call', function() {
let client: MatrixClient;
beforeEach(() => {
client = new MatrixClient({
baseUrl: "base_url",
request: (() => {}) as any, // NOP
});
client = new MatrixClient({ baseUrl: "base_url" });
jest.spyOn(client, "sendStateEvent").mockResolvedValue({} as any);
});