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

[CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-dev

Browse Source
This commit is contained in:
Travis Ralston
2020-01-07 14:37:17 -07:00
parent fffcdcb514 efadf374d6
commit 18ccceca2d
16 changed files with 881 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spec/integ/megolm-integ.spec.js
View File

@ -615,6 +615,9 @@ describe("megolm", function() {
).respond(200, {
event_id: '$event_id',
});
aliceTestClient.httpBackend.when(
'PUT', '/sendToDevice/org.matrix.room_key.withheld/',
).respond(200, {});
return Promise.all([
aliceTestClient.client.sendTextMessage(ROOM_ID, 'test'),
@ -712,6 +715,9 @@ describe("megolm", function() {
event_id: '$event_id',
};
});
aliceTestClient.httpBackend.when(
'PUT', '/sendToDevice/org.matrix.room_key.withheld/',
).respond(200, {});
return Promise.all([
aliceTestClient.client.sendTextMessage(ROOM_ID, 'test2'),