matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-29 16:43:09 +03:00
Code Activity

Stop using bluebird .returns and .spread

Browse Source
This commit is contained in:
Michael Telatynski
2019-11-25 12:27:12 +00:00
parent bd8f8ef28d
commit 7fb807919c
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spec/integ/matrix-client-crypto.spec.js
View File

@@ -203,7 +203,7 @@ function aliSendsFirstMessage() {
expectAliQueryKeys() expectAliQueryKeys()
.then(expectAliClaimKeys) .then(expectAliClaimKeys)
.then(expectAliSendMessageRequest), .then(expectAliSendMessageRequest),
]).spread(function(_, ciphertext) { ]).then(function([_, ciphertext]) {
return ciphertext; return ciphertext;
}); });
} }
@@ -218,7 +218,7 @@ function aliSendsMessage() {
return Promise.all([ return Promise.all([
sendMessage(aliTestClient.client), sendMessage(aliTestClient.client),
expectAliSendMessageRequest(), expectAliSendMessageRequest(),
]).spread(function(_, ciphertext) { ]).then(function([_, ciphertext]) {
return ciphertext; return ciphertext;
}); });
} }
@@ -234,7 +234,7 @@ function bobSendsReplyMessage() {
sendMessage(bobTestClient.client), sendMessage(bobTestClient.client),
expectBobQueryKeys() expectBobQueryKeys()
.then(expectBobSendMessageRequest), .then(expectBobSendMessageRequest),
]).spread(function(_, ciphertext) { ]).then(function([_, ciphertext]) {
return ciphertext; return ciphertext;
}); });
} }
@@ -492,7 +492,7 @@ describe("MatrixClient crypto", function() {
aliTestClient.client.getStoredDevicesForUser(bobUserId), aliTestClient.client.getStoredDevicesForUser(bobUserId),
aliTestClient.client.getStoredDevicesForUser(eveUserId), aliTestClient.client.getStoredDevicesForUser(eveUserId),
]); ]);
}).spread((bobDevices, eveDevices) => { }).then(([bobDevices, eveDevices]) => {
// should get an empty list // should get an empty list
expect(bobDevices).toEqual([]); expect(bobDevices).toEqual([]);
expect(eveDevices).toEqual([]); expect(eveDevices).toEqual([]);

2
src/crypto/algorithms/olm.js
View File

@@ -139,7 +139,7 @@ OlmEncryption.prototype.encryptMessage = async function(room, eventType, content
} }
} }
return await Promise.all(promises).return(encryptedContent); return await Promise.all(promises).then(() => encryptedContent);
}; };
/** /**