1
0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-08-07 23:02:56 +03:00

Merge branch 'develop' into robertlong/group-call

This commit is contained in:
Robin Townsend
2022-10-13 20:14:29 -04:00
104 changed files with 6514 additions and 4382 deletions

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 = () => {};