matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-08-10 21:23:02 +03:00
Code Activity
4,700 Commits 249 Branches 493 Tags
bf92cb15223b8549800f19b10023e6daae9f497d
Commit Graph

33 Commits

Author SHA1 Message Date
Bruno Windels
00c003ec65 remove methods arg to requestVerification(DM) 
as it's easy to have this argument be out of sync from all
the places this is called from the js-sdk. There is also little point,
as you can already specify the methods a consumer of the js-sdk
wants to provide through the verificationMethods option when creating
the client object.
 2020-02-11 17:42:49 +01:00
Travis Ralston
b8092cd00b Make the tests pass 2020-01-23 20:41:52 -07:00
Bruno Windels
bd9a2c13eb implement API change in sas test for requestVerificationDM 2020-01-20 17:55:48 +01:00
Travis Ralston
034b8db070 Convert tests to ES6 
The earlier commit, d3ce0cb82f, has most of the juicy details on this. In addition to d3ce's changes, we also:
* Use `TestClient` in many integration tests due to subtle behaviour changes in imports when switching to ES6. Namely the behaviour where setting the request function is less reliable in the way we did it, but `TestClient` is very reliable.
* We now use the Olm loader more often to avoid having to maintain so much duplicate code. This makes the imports slightly easier to read.
 2019-12-17 15:16:37 -07:00
Travis Ralston
ca6a52727c Fix logger imports in tests 2019-12-10 11:39:56 -07:00
Michael Telatynski
70eb8a7300 Merge pull request #1100 from matrix-org/t3chguy/remove_bluebird_13 
Remove Bluebird: phase 2.5
 2019-12-10 16:58:22 +00:00
Bruno Windels
df6ebf83b4 fix tests 2019-12-09 17:45:01 +01:00
Michael Telatynski
c4ae27dae6 Merge branches 'develop' and 't3chguy/remove_bluebird_13' of github.com:matrix-org/matrix-js-sdk into t3chguy/remove_bluebird_13 2019-12-02 22:56:13 +00:00
Michael Telatynski
0170cb066d add another clean-up to sas.spec.js 2019-12-02 22:34:46 +00:00
Hubert Chathi
59b25d6837 increase timeout on flush to fix failing unit test 
also remove unused requests
 2019-11-28 16:53:21 -05:00
Travis Ralston
7392b4de17 xit instead of comment 2019-11-27 19:23:59 -07:00
Travis Ralston
79b0a5fada Add issue to comment 2019-11-27 19:21:57 -07:00
Travis Ralston
aee9442e52 Disable broken cross-signing test 
I don't know why it's broken, but the two errors I can get out of it are "unknown device for verification" and "user_signing key does not match". Someone who knows a bit more about cross-signing will probably need to take a look at this one.

Fixes https://github.com/vector-im/riot-web/issues/11520 (technically)
Opened https://github.com/vector-im/riot-web/issues/11545 to fix this correctly.
 2019-11-27 19:20:09 -07:00
Travis Ralston
e0c90ec9e3 Fix test flakes in SAS verification with old MAC 
This has similar fixes to 7ad5021147

Part of https://github.com/vector-im/riot-web/issues/11520
 2019-11-26 23:29:06 -07:00
Travis Ralston
7ad5021147 Fix SAS verification test 
There's 3 things going on in this commit:
1. `this` is maintained in the tests. Some binds are added instead of the `.call(this, ...)` syntax.
2. We use the right `origSendToDevice`
3. We ensure `downloadKeys` is actually on the client

The combination of these 3 fixes makes the test pass.

Part of https://github.com/vector-im/riot-web/issues/11520
 2019-11-26 23:24:37 -07:00
Michael Telatynski
057303d57c s/beforeEach/beforeAll/ for Olm.init() and cleanup sas.spec.js 2019-11-25 13:26:10 +00:00
Michael Telatynski
fd58957b06 migrate to jest from mocha+expect+istanbul 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-11-20 19:52:50 +00:00
David Baker
d37ed9ff6f lint 2019-11-15 12:39:14 +00:00
David Baker
e541b96a71 Change check{User|Device}Trust interfaces 
...to return objects with functions rather than a bitmask
 2019-11-15 12:15:13 +00:00
David Baker
03fe4afe32 lint 2019-11-07 15:20:07 +00:00
David Baker
12627022d1 Convert sas verification test to callbacks 2019-11-07 15:18:16 +00:00
David Baker
49588da73d Fix more tests 2019-10-29 19:39:31 +00:00
David Baker
3e2d845342 Merge remote-tracking branch 'origin/develop' into dbkr/cross_signing 2019-10-28 16:47:16 +00:00
David Baker
de1b545df1 lint 2019-10-28 15:42:42 +00:00
David Baker
8cad116dd7 Make tests pass 
* Pass the http backend out of makeTestClients so we can tell it
   to expect queries and flush requests out
 * Change colons to dots in the key events
 2019-10-28 14:56:35 +00:00
Hubert Chathi
d8e8dddd25 initial implementation of verification in DMs 2019-10-08 15:44:51 -04:00
Travis Ralston
f80af68686 End the verification timer when verification is done 
Fixes https://github.com/matrix-org/matrix-js-sdk/issues/980

This also improves cleanliness in the tests to cancel/terminate timers when needed.
 2019-07-10 14:51:12 -06:00
Hubert Chathi
6f6e7ea921 verify cross-signing key with SAS 2019-06-05 15:27:31 -04:00
jkasun
a73dabcb67 Console logging to loglevel 2019-05-19 09:29:40 +05:30
Hubert Chathi
01af303d63 fix the selection of the verification methods, and test more things 2019-04-04 14:08:30 -04:00
Hubert Chathi
d1e64d0cfb support both the incorrect and correct MAC methods 
also do some refactoring to make it easier to support choices in the other
methods in the future
 2019-04-02 23:36:49 -04:00
Hubert Chathi
fb673b0304 change hex SAS verification to decimal and emoji 2019-02-08 00:56:30 -05:00
Hubert Chathi
244e1b84f7 Initial implementation of key verification 2019-01-23 13:34:25 -05:00