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

Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share

Browse Source 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
This commit is contained in:
Šimon Brandner
2021-05-28 17:37:17 +02:00
parent 75321220fd 25ec81b6c7
commit f46190509a
13 changed files with 101 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spec/unit/relations.spec.ts
View File

@@ -72,7 +72,7 @@ describe("Relations", function() {
}
});
it("should emit created regardless of ordering", async function () {
it("should emit created regardless of ordering", async function() {
const targetEvent = new MatrixEvent({
"sender": "@bob:example.com",
"type": "m.room.message",

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

@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import {TestClient} from '../../TestClient';
import {MatrixCall, CallErrorCode, CallEvent} from '../../../src/webrtc/call';
import { TestClient} from '../../TestClient';
import { MatrixCall, CallErrorCode, CallEvent } from '../../../src/webrtc/call';
import { SDPStreamMetadataKey, SDPStreamMetadataPurpose } from '../../../src/webrtc/callEventTypes';
const DUMMY_SDP = (