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

Merge branches 'develop' and 't3chguy/remove_bluebird_13' of github.com:matrix-org/matrix-js-sdk into t3chguy/remove_bluebird_13

Browse Source
This commit is contained in:
Michael Telatynski
2019-12-02 22:56:13 +00:00
parent 053bc49738 92ca2386ea
commit c4ae27dae6
1 changed files with 2 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
spec/unit/crypto/verification/sas.spec.js
View File

@@ -275,9 +275,7 @@ describe("SAS verification", function() {
expect(aliceDevice.isVerified()).toBeTruthy();
});
// TODO: Turn this test back on by fixing it.
// See https://github.com/vector-im/riot-web/issues/11545 and related issues.
xit("should verify a cross-signing key", async () => {
it("should verify a cross-signing key", async () => {
alice.httpBackend.when('POST', '/keys/device_signing/upload').respond(
200, {},
);
@@ -296,33 +294,17 @@ describe("SAS verification", function() {
},
);
alice.httpBackend.when('POST', '/keys/query').respond(200, {
failures: {},
device_keys: {
"@bob:example.com": BOB_DEVICES,
},
});
bob.httpBackend.when('POST', '/keys/query').respond(200, {
failures: {},
device_keys: {
"@alice:example.com": ALICE_DEVICES,
},
});
const verifyProm = Promise.all([
aliceVerifier.verify(),
bobPromise.then((verifier) => {
bob.httpBackend.when(
'POST', '/keys/signatures/upload',
).respond(200, {});
bob.httpBackend.flush(undefined, 2);
bob.httpBackend.flush(undefined, 1, 2000);
return verifier.verify();
}),
]);
await alice.httpBackend.flush(undefined, 1);
console.log("alice reqs flushed");
await verifyProm;
const bobDeviceTrust = alice.client.checkDeviceTrust(