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

make algorithm.hasKeysForKeyRequest async

Browse Source
This commit is contained in:
Richard van der Hoff
2017-07-26 08:04:46 +01:00
parent d821082843
commit 18f75ec61c
4 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
spec/unit/crypto/algorithms/megolm.spec.js
View File

@@ -119,29 +119,32 @@ describe("MegolmDecryption", function() {
},
};
expect(megolmDecryption.hasKeysForKeyRequest(keyRequest))
.toBe(true);
return megolmDecryption.hasKeysForKeyRequest(
keyRequest,
).then((hasKeys) => {
expect(hasKeys).toBe(true);
// set up some pre-conditions for the share call
const deviceInfo = {};
mockCrypto.getStoredDevice.andReturn(deviceInfo);
// set up some pre-conditions for the share call
const deviceInfo = {};
mockCrypto.getStoredDevice.andReturn(deviceInfo);
const awaitEnsureSessions = new Promise((res, rej) => {
mockOlmLib.ensureOlmSessionsForDevices.andCall(() => {
res();
return Promise.resolve({'@alice:foo': {'alidevice': {
sessionId: 'alisession',
}}});
const awaitEnsureSessions = new Promise((res, rej) => {
mockOlmLib.ensureOlmSessionsForDevices.andCall(() => {
res();
return Promise.resolve({'@alice:foo': {'alidevice': {
sessionId: 'alisession',
}}});
});
});
});
mockBaseApis.sendToDevice = expect.createSpy();
mockBaseApis.sendToDevice = expect.createSpy();
// do the share
megolmDecryption.shareKeysWithDevice(keyRequest);
// do the share
megolmDecryption.shareKeysWithDevice(keyRequest);
// it's asynchronous, so we have to wait a bit
return awaitEnsureSessions.then(() => {
// it's asynchronous, so we have to wait a bit
return awaitEnsureSessions;
}).then(() => {
// check that it called encryptMessageForDevice with
// appropriate args.
expect(mockOlmLib.encryptMessageForDevice.calls.length)