Commit graph

679 commits

Author SHA1 Message Date
J. Ryan Stinnett
cf4ed1bcdf Fix tests 2021-03-26 11:56:58 +00:00
Travis Ralston
5d9b36afc1 Fix tests 2021-03-25 23:47:41 -06:00
Clemens Zeidler
2a21d45ac0 Merge branch 'develop' into key-bindings 2021-03-12 16:44:12 +13:00
Travis Ralston
6ab235f10c Fix tests for new call path
We have to mock `fetch` for the caching of the download icon, and then mock out all the function calls used by components to feed a Media object.
2021-03-11 09:42:55 -07:00
Travis Ralston
533c9fed64 Appease the linter 2021-03-10 12:32:18 -07:00
Travis Ralston
375ffafda6 Fix tests failing to load skin
We should find a better way to do this, but this works well enough.
2021-03-09 10:13:16 -07:00
Travis Ralston
591ccabab9 Remove a bunch of useless 'use strict' definitions 2021-03-08 20:26:08 -07:00
J. Ryan Stinnett
b12cf7912a
Merge pull request #5624 from SimonBrandner/show-room-name
Display room name in pills instead of address
2021-03-08 16:27:43 +00:00
Clemens Zeidler
06181221a1 Add copyright headers 2021-03-07 19:05:36 +13:00
Clemens Zeidler
4a6f931782 Merge branch 'develop' into key-bindings 2021-03-04 21:10:35 +13:00
Travis Ralston
0dd4d45c49 Disable velocity mock option
This appears to have been removed in the beta
2021-02-26 22:36:42 -07:00
Michael Telatynski
f45510ed25 Fix test assuming too much about the underlying calls 2021-02-19 13:08:30 +00:00
Michael Telatynski
3c52446205 Remove redundant PhasedRollOut 2021-02-19 00:01:07 +00:00
Clemens Zeidler
4a138f3b84 Only support a single key in the KeyCombo
Keep it simple...
2021-02-15 19:21:08 +13:00
David Baker
196507a730 VoIP virtual rooms, mk II
Does a thirdparty protocol lookup to the homeserver to get the
corresponding native/virtual user for a matrix ID. Stores the
mappings in room account data. Involves some slightly nasty workarounds
for that fact that room account data has no local echo.
2021-02-12 20:55:54 +00:00
Šimon Brandner
a075568e89
Fixed tests
In the previous commits I have removed the native title/tooltip so it needs to be removed from the tests as well

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-12 11:34:09 +01:00
Clemens Zeidler
c7f9defd12 Add simple implementation of a KeyBindingsManager + match tests 2021-02-12 22:04:33 +13:00
J. Ryan Stinnett
474c029db5 Fix permalink via parsing for rooms
This adjusts the app local link parsing path to better handle `via`s in query
params. Previously this path only expected them when an event ID was also
present, but it's also valid to have `via`s without event IDs as well.

Fixes https://github.com/vector-im/element-web/issues/16345
2021-02-03 15:18:19 +00:00
Michael Telatynski
5a49cbf51a
Merge pull request #5600 from weeman1337/fix-e2et-run-out
Fix app-url hint in the e2e-test run script output
2021-02-01 12:47:12 +00:00
J. Ryan Stinnett
89b835dd20
Merge pull request #5575 from matrix-org/jryans/no-event-pills
Remove pills from event permalinks with text
2021-02-01 10:53:22 +00:00
Michael Weimann
0660371461
fix typo in end-to-end-test run script output
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2021-01-31 09:53:15 +01:00
J. Ryan Stinnett
0cb266eda2 lolex renamed to @sinonjs/fake-timers 2021-01-27 12:31:37 +00:00
J. Ryan Stinnett
fa3ace8473 Rework message pilling to ignore event permalinks
This removes pills from event permalinks since they hide the text associated
with the link, which can cause nonsensical messages since words have been
removed. In addition, this moves away from fragile regexs to more
straightforward code to parse links and adds a test for this case.

Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/5188
Fixes https://github.com/vector-im/element-web/issues/15159
2021-01-27 11:46:20 +00:00
David Baker
f703383ab6
Merge pull request #5560 from matrix-org/dbkr/voip_user_mapper
Add VoIP user mapper
2021-01-22 14:12:08 +00:00
David Baker
ba45b47240 Oops, the tests won't work if we don't export the functions 2021-01-21 22:42:12 +00:00
David Baker
0a90c982c7 Add VoIP user mapper
The accompanying element-web PR with the config documentation should
explain what this is & why. Internally, this breaks the assumption
that call.roomId is the room that the call appears in for the user.
call.roomId may now be a 'virtual' room while the react SDK actually
displays it in a different room. React SDK always stores the calls
under the user-facing rooms, and provides a function to get the
user-facing room for a given call.
2021-01-21 19:20:35 +00:00
J. Ryan Stinnett
e49a931588
Merge pull request #5533 from aaronraimist/security-key
Change a bunch of strings from Recovery Key/Phrase to Security Key/Phrase
2021-01-21 17:46:02 +00:00
J. Ryan Stinnett
97a551c04a Fix test 2021-01-14 17:39:58 +00:00
David Baker
6371a4abd1 Fix tests
Remove stray file extensions in includes and update shared instance
name.
2021-01-13 16:02:35 +00:00
Aaron Raimist
4f96d5dee5
Change a bunch of strings from Recovery Key/Phrase to Security Key/Phrase
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-01-04 19:17:17 -06:00
Michael Telatynski
2142a65a9b delint 2020-12-16 10:46:39 +00:00
Michael Telatynski
4c2b6f410b fix tests 2020-12-16 10:41:56 +00:00
J. Ryan Stinnett
70f24baaf1
Merge pull request #5425 from macekj/emoji_quick_shortcut
Add keyboard shortcut for emoji reactions
2020-12-14 13:12:49 +00:00
Simon Merrick
b365d3b27e Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into new/room-alias-in-permalink 2020-12-07 10:30:50 +13:00
macekj
0c85cb587d Merge branch 'develop' into emoji_quick_shortcut 2020-12-04 11:05:50 -05:00
J. Ryan Stinnett
1fda735222 Rebrand various CI scripts and modules
This replaces Riot with Element in various CI scripts, modules, parameters, etc.
This _should_ be the last major rebranding pass (hopefully).

Fixes https://github.com/vector-im/element-web/issues/14894
2020-12-03 13:56:27 +00:00
Simon Merrick
6670c727a4 Add getCanonicalAlias to mock 2020-12-02 13:28:35 +13:00
Michael Telatynski
eb25c39318 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/socials
 Conflicts:
	src/i18n/strings/en_EN.json
2020-12-01 16:33:29 +00:00
Michael Telatynski
3bdedd73f7 fix another test 2020-11-25 11:38:43 +00:00
Michael Telatynski
c4084196d1 delint 2020-11-25 10:39:44 +00:00
Michael Telatynski
1b1c482f9c Iterate tests 2020-11-25 10:22:16 +00:00
macekj
ba8d02a808 add quick shortcut emoji feature and tests
Signed-off-by: macekj <macekj@umich.edu>
2020-11-17 17:36:58 -05:00
Aleks Kissinger
5f3af7863a Merge branch 'develop' into katex 2020-11-10 18:19:20 +00:00
Michael Telatynski
4997676f5d fix last remaining broken test 2020-11-05 16:57:51 +00:00
Michael Telatynski
ae2d9941ff fix more tests 2020-11-05 16:54:25 +00:00
Michael Telatynski
54e41b5f32 fix tests 2020-11-05 16:27:41 +00:00
Michael Telatynski
6029f2a03b update e2e tests for invite ux tweaks 2020-11-03 15:16:52 +00:00
David Baker
db0d74d0d4 Remove a couple more files from eslintignore
Just var/const & spaces
2020-10-30 18:33:33 +00:00
Aleks Kissinger
3f9f1d03c8 stubbed isGuest for unit tests 2020-10-29 13:22:09 +00:00
Michael Telatynski
b7a1e698df fix tests which use a private method
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-14 10:47:46 +01:00
Michael Telatynski
b2d04deb83 fix tests for the new sessionStorage key
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-08 10:04:01 +01:00
Michael Telatynski
a8d88e01fb Write Enzyme tests for SendMessageComposer state/history persistence behaviour
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-07 00:10:40 +01:00
Michael Telatynski
965debf442 extend mockClient in testutils
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-07 00:09:48 +01:00
Michael Telatynski
ffa7ceb70e Trim range when formatting so that it excludes leading/trailing spaces
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-29 14:15:20 +01:00
Michael Telatynski
fe67ebf1fd
Merge pull request #5209 from matrix-org/t3chguy/fix/12591
Retry loading i18n language if it fails
2020-09-24 17:03:25 +01:00
J. Ryan Stinnett
b5000b236f Fix lint error 2020-09-16 17:12:51 +01:00
J. Ryan Stinnett
a18d0271c3 Adjust tests for Secure Backup toast 2020-09-16 16:51:10 +01:00
J. Ryan Stinnett
46f37fb969 Create cross-signing keys during authentication
With this change, Element now creates cross-signing keys during auth flows for
password login. For other auth flows like token / SSO, it will not happen until
a cross-signing / secret storage dialog flow as before.
2020-09-16 15:03:06 +01:00
J. Ryan Stinnett
7bd5e3fa31 Move security-related dialogs to a common directory 2020-09-16 15:03:06 +01:00
Michael Telatynski
608249745a Attempt to fix tests some more 2020-09-15 13:19:47 +01:00
Michael Telatynski
39a59dbefa fix CI some more 2020-09-09 12:59:41 +01:00
Michael Telatynski
d9e17e89b5 fix CI 2020-09-09 12:55:16 +01:00
Michael Telatynski
b635598bc3 Attempt to fix tests and fix RoomSummaryCard having wrong member count 2020-09-09 12:28:12 +01:00
Michael Telatynski
8dcb2d4719 attempt to fix CI tests 2020-09-09 12:06:16 +01:00
Michael Telatynski
bb98587143 fix e2e tests. Change the default Room Tab to RoomSummary 2020-09-09 11:42:41 +01:00
Michael Telatynski
fb0b784369 test CI 2020-09-09 10:56:14 +01:00
Michael Telatynski
c8bc80a3b1 test with delay 2020-09-09 10:07:43 +01:00
Michael Telatynski
644ff56ace Fix e2e tests 2020-09-09 09:38:13 +01:00
Michael Telatynski
c120458b81 fix test stub 2020-08-29 13:02:45 +01:00
Michael Telatynski
72498df28f Remove create-react-class 2020-08-29 12:14:16 +01:00
Travis Ralston
c815a370e7 Remove some unused components
We no longer have tinting support, so remove it. We still need the `Tinter` to exist though as it's used in quite a few places (though does nothing). Similarly, we have to keep the `roomColor` setting due to it being used in a few places - another PR can take away the tinter support properly.

The room tile context menu and top left menu are artifacts of the old room list.

The end to end tests weren't failing before as the code path is unused, however it seems worthwhile to keep it as we will eventually need it.
2020-08-20 20:47:02 -06:00
Travis Ralston
4f851542ac Implement force state for features like in the proposal 2020-08-17 13:51:41 -06:00
Michael Telatynski
62c1798bec try to fix the e2e tests 2020-08-13 16:55:48 +01:00
Jorik Schellekens
0060acbb33
Merge pull request #5056 from matrix-org/joriks/style-fighting
Quick win session 24/07/2020
2020-08-12 15:21:06 +01:00
J. Ryan Stinnett
2e76e19f37 Remove rebrand toast from tests 2020-08-12 14:58:55 +01:00
J. Ryan Stinnett
ce226ab534 Replace Riot with Element in docs and comments
This only covers the simple cases of references to issues and repos. More
complex areas, such as deployment scripts, will be handled separately.

Part of https://github.com/vector-im/element-web/issues/14864
2020-08-03 18:33:36 +01:00
Jorik Schellekens
749aaf0b54 Fix tests 2020-07-28 14:59:03 +01:00
Michael Telatynski
c578026474 Merge branches 'develop' and 't3chguy/fix/13641' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/13641
 Conflicts:
	src/editor/parts.ts
2020-07-24 08:18:20 +01:00
Michael Telatynski
93b0287e11 s/semi-colon/colon/
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-24 00:04:50 +01:00
Michael Telatynski
38e93469d3 Fix broken test
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-23 09:01:44 +01:00
Michael Telatynski
8018a20680 create acceptance tests
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-21 17:40:34 +01:00
Travis Ralston
2dfd636a9e Appease the linter 2020-07-17 16:28:49 -06:00
Travis Ralston
c9b0b3b31d RoomSublist2 -> RoomSublist 2020-07-17 15:46:46 -06:00
Travis Ralston
96065ae982 RoomTile2 -> RoomTile 2020-07-17 15:43:29 -06:00
Travis Ralston
a7c18bfbfa RoomList2 -> RoomList 2020-07-17 15:27:49 -06:00
Travis Ralston
2441cbc9ac LeftPanel2 -> LeftPanel 2020-07-17 15:22:18 -06:00
Travis Ralston
2b15ba21dd Rename RoomListStore file 2020-07-17 15:11:34 -06:00
Travis Ralston
209a5d2220 Rename RoomListStore2 class name
We use `RoomListStore` as a singleton, and don't want the ugly `2` at the end of the actual store instance, so here we rename it to something half-decent.
2020-07-17 15:10:30 -06:00
Michael Telatynski
e75b33c66c fix e2e tests
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-17 19:41:45 +01:00
dependabot[bot]
4d61d6320a
Bump lodash from 4.17.15 to 4.17.19 in /test/end-to-end-tests
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>
2020-07-16 15:12:32 +00:00
Travis Ralston
226f755259 Match the string correctly 2020-07-15 04:59:34 -06:00
Travis Ralston
6994b8c5ea Bob needs to accept the toast too 2020-07-15 04:50:15 -06:00
Travis Ralston
cc18438a0a Fix another toast 2020-07-15 04:32:07 -06:00
Travis Ralston
2def39fef7 Fix brand too 2020-07-15 04:21:37 -06:00
Travis Ralston
86cb3cf93f Incorporate new toasts into end-to-end tests 2020-07-15 04:13:38 -06:00
Travis Ralston
3826d81358 Enable test mode 2020-07-10 11:05:56 -06:00
Travis Ralston
bba8197592 Use the new layout store 2020-07-09 22:40:34 -06:00
Travis Ralston
75dbd5f1d4 Merge branch 'develop' into travis/room-list/enable 2020-07-09 22:28:16 -06:00
Travis Ralston
9bf2505e51 queryAll, not just query 2020-07-07 16:48:03 -06:00
Travis Ralston
9000888013 Pass the session through 2020-07-07 16:38:24 -06:00
Travis Ralston
f12d951209 Update end-to-end tests for new room list 2020-07-07 16:34:42 -06:00
Travis Ralston
121e41d20b Remove irrelevant function 2020-07-07 16:20:53 -06:00
Travis Ralston
5ace405062 The linter will never be appeased 2020-07-07 16:01:42 -06:00
Travis Ralston
85af3ebcc0 Lie about DMs in tests 2020-07-07 15:58:15 -06:00
Travis Ralston
044c223899 Remove debug 2020-07-07 15:53:12 -06:00
Travis Ralston
767db73853 Appease the linter 2020-07-07 15:50:04 -06:00
Travis Ralston
f89fcd1fe9 Fix tests and add general safety
We don't need the fake clock anymore, but we do have to wait for async actions to complete before moving forward.

This also exposes a number of functions for the store to be puppetted with.
2020-07-07 15:45:59 -06:00
Travis Ralston
c774b88bda Initial pass of fixing tests
* Use new components
* Use new tagId prop on sublists
* Define onResize for the room list so it doesn't crash
2020-07-07 15:06:06 -06:00
Jorik Schellekens
99734dcfe8 please work 2020-07-07 17:11:14 +01:00
Jorik Schellekens
af2b826136 Please fix test 2020-07-07 16:57:56 +01:00
David Baker
2969820371 LINT 2020-06-26 20:31:22 +01:00
David Baker
0579c9f748 Fix tests 2020-06-26 20:25:38 +01:00
David Baker
65febd24eb lint 2020-06-25 13:52:38 +01:00
David Baker
0acb35dc23 Update end to end tests 2020-06-25 13:48:11 +01:00
Michael Telatynski
69c5aecfc7
Merge pull request #4784 from bocoup/extend-querymatcher-heuristic
Extend QueryMatcher's sorting heuristic
2020-06-18 19:36:42 +01:00
David Baker
e0a34d9dea
Revert "Use recovery keys over passphrases" 2020-06-18 09:35:11 +01:00
Mike Pennisi
6af4d82ce7 Extend QueryMatcher's sorting heuristic
Use the order of the input keys as a signal for relative importance of
matches.

Signed-off-by: Mike Pennisi <mike@mikepennisi.com>
2020-06-17 23:41:41 -04:00
Travis Ralston
803b7bb30f
Merge pull request #4694 from justin-sleep/remove-escape-backslashes
Remove escape backslashes in non-Markdown messages
2020-06-17 11:06:04 -06:00
Justin Sleep
bdc451d66b Remove escape backslashes in non-Markdown messages 2020-06-03 17:08:13 -05:00
David Baker
0c1809bb38 lint 2020-06-03 13:24:56 +01:00
David Baker
802f9a4bc1 Fix end to end tests for new UI 2020-06-03 13:04:29 +01:00
Michael Telatynski
5b31fdd308 remove stale references to MatrixToolbar
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-30 12:36:17 +01:00
Michael Telatynski
71108fcf39 delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-27 17:02:32 +01:00
Michael Telatynski
7486338efa Fix.the.tests.
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-27 16:51:04 +01:00
Michael Telatynski
e35c9d5bbf more testing
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-27 15:18:43 +01:00
Michael Telatynski
cb07fa53f4 test
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-27 15:05:40 +01:00
Michael Telatynski
63ac1cb4ab debug some more
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-27 14:56:24 +01:00
Michael Telatynski
f3dfdbe746 debug
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-27 14:36:44 +01:00
Michael Telatynski
91811581bc fix assertNoToasts
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-27 14:35:59 +01:00
Michael Telatynski
61066b0c4c test it again
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-27 14:27:09 +01:00
Michael Telatynski
627b568588 check if it is a race
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-27 13:48:20 +01:00
Michael Telatynski
841ce74ac2 Fix assert vs assert.equal
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-27 13:39:00 +01:00
Michael Telatynski
faaca43a75 more loggin'
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-27 13:35:15 +01:00
Michael Telatynski
37c875b863 improve end to end tests
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-27 13:23:49 +01:00
Michael Telatynski
d9552c7f5c e2e test toasts v2
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-27 13:10:28 +01:00
Michael Telatynski
7b6d49c416 e2e test toasts
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-27 12:57:45 +01:00
Michael Telatynski
b7c688d328 test e2e tests workaround
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-27 12:40:38 +01:00
Michael Telatynski
73d966443c fix tests
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-24 14:25:31 +01:00
Michael Telatynski
880e16aaa2 Merge branches 'develop' and 't3chguy/leaks' of github.com:matrix-org/matrix-react-sdk into t3chguy/leaks
 Conflicts:
	src/components/views/avatars/BaseAvatar.js
	test/components/views/messages/TextualBody-test.js
2020-05-23 11:12:58 +01:00
Travis Ralston
7ff850deea
Merge pull request #4253 from matrix-org/travis/room-list-2
Rewrite the room list store
2020-05-21 13:30:32 -06:00
Jorik Schellekens
adec5a4f92 fix test 2020-05-20 15:09:10 +01:00
Michael Telatynski
e79959a4ec try fix tests
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-15 00:31:30 +01:00
Travis Ralston
2b4c19e9ba Merge branch 'travis/dispatcher-types' into travis/room-list-2 2020-05-14 13:40:37 -06:00
Travis Ralston
08419d195e Initial breakout for room list rewrite
This does a number of things (sorry):
* Estimates the type changes needed to the dispatcher (later to be replaced by https://github.com/matrix-org/matrix-react-sdk/pull/4593)
* Sets up the stack for a whole new room list store, and later components for usage.
* Create a proxy class to ensure the app still functions as expected when the various stores are enabled/disabled
* Demonstrates a possible structure for algorithms
2020-05-14 12:44:29 -06:00
Travis Ralston
90a898d03f Move dispatcher into a subdirectory
We're expecting to have a whole bunch of types for the dispatched payloads, so pull the thing into a directory we can throw them in.
2020-05-13 21:07:50 -06:00
David Baker
719faed2ff Separate toasts for existing & new device verification
Separate device verification toasts into ones for devices that were
there when the app loaded and a separate toast for each device that
has appeared since.

Reverts part of https://github.com/matrix-org/matrix-react-sdk/pull/4506
(clicking a device from your own UserInfo now triggers the legacy
verification flow again).

Fixes https://github.com/vector-im/riot-web/issues/13422
Fixes https://github.com/vector-im/riot-web/issues/13418
2020-04-28 18:35:16 +01:00
Jorik Schellekens
fd25170c57 lint test 2020-04-27 11:51:55 +01:00
Jorik Schellekens
18db25f601 Fix test 2020-04-27 11:51:55 +01:00
Michael Telatynski
59cc7f0867 here's hoping Synapse doesn't actually try to send an email :D
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-22 13:50:40 +01:00
Michael Telatynski
162531f1c5 try to enable e2e test synapse registration 3pid support
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-22 13:36:14 +01:00