Commit graph

812 commits

Author SHA1 Message Date
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
Travis Ralston
dd444ffa5d
Merge pull request #4436 from matrix-org/travis/e2e-e2e-tests
Fix end-to-end tests for end-to-end encryption verification
2020-04-17 15:14:12 -06:00
Travis Ralston
432dbab8cb Fix start chat button variable name 2020-04-17 15:06:59 -06:00
Travis Ralston
88b5c3ca84 Don't explode if the e2e test directory exists when crashing
This is largely expected in local test environments where the developer probably won't remember to clear out the directory themselves.
2020-04-17 14:39:45 -06:00
Travis Ralston
77df610653 Appease the linter a bit more 2020-04-17 14:38:05 -06:00
Travis Ralston
5a9898591d Appease the linter 2020-04-17 14:35:02 -06:00
Travis Ralston
e72008d7f1 Fix end-to-end tests for end-to-end encryption verification
Fixes https://github.com/vector-im/riot-web/issues/13226

This isn't the fastest route, but it is a predictable route for the happy path we probably want to test. For example, Alice will already be staring at the DM and could easily accept the verification there, but we probably want to make sure that the toast is present and does the right thing. Similarly, neither of them need to verify that there's green shields everywhere, they should be implied, however an explicit check follows a real user's gaze.
2020-04-17 14:31:33 -06:00
Travis Ralston
885bb112ae
Merge pull request #4430 from matrix-org/dependabot/npm_and_yarn/test/end-to-end-tests/https-proxy-agent-2.2.4
Bump https-proxy-agent from 2.2.1 to 2.2.4 in /test/end-to-end-tests
2020-04-17 12:44:57 -06:00
Travis Ralston
e485f7a82c
Merge pull request #4432 from matrix-org/travis/e2e-docs
Minor updates to e2e test instructions on Windows
2020-04-17 09:54:58 -06:00
Travis Ralston
a5f5f759cb Create unencrypted rooms by default in e2e-tests
Otherwise the lazy loading test will try to join the room after the encrypted messages have already been sent, making them invisible. 

See https://github.com/vector-im/riot-web/issues/13226#issuecomment-614928362
2020-04-16 16:27:43 -06:00
Travis Ralston
0489dcc8da Minor updates to e2e test instructions on Windows 2020-04-16 15:55:33 -06:00
dependabot[bot]
d05ceec9d6
Bump https-proxy-agent from 2.2.1 to 2.2.4 in /test/end-to-end-tests
Bumps [https-proxy-agent](https://github.com/TooTallNate/node-https-proxy-agent) from 2.2.1 to 2.2.4.
- [Release notes](https://github.com/TooTallNate/node-https-proxy-agent/releases)
- [Commits](https://github.com/TooTallNate/node-https-proxy-agent/compare/2.2.1...2.2.4)

Signed-off-by: dependabot[bot] <support@github.com>
2020-04-16 18:53:03 +00:00
Travis Ralston
4af33d91eb Track the issue number too 2020-04-16 12:26:08 -06:00
Travis Ralston
d04af1f3a8 Disable e2e tests for now 2020-04-16 12:24:04 -06:00
Travis Ralston
f4a5361b14 Wait a bit before continuing with the passphrase
The continue button is probably no-oping due to being disabled.
2020-04-16 12:13:05 -06:00
Travis Ralston
5769b07a92 Select the right continue button
There's no buttons in the field.
2020-04-16 12:04:48 -06:00
Travis Ralston
25fa675f88 Blind attempt at fixing the end to end tests 2020-04-16 11:46:29 -06:00
Michael Telatynski
e942a35525 Fixxy
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-16 14:09:41 +01:00
Michael Telatynski
9c1939b756 match all, not just first instance of tokens to escape
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 02:31:30 +01:00
Michael Telatynski
4454db30d6 Escape opening square bracket too
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 01:02:08 +01:00
Michael Telatynski
f1def8b0de delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 00:50:28 +01:00
Michael Telatynski
95eaf94cd8 Fix pills being broken by unescaped characters
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 00:40:38 +01:00
Travis Ralston
b4b0c4c6df Add comments to highlight where we'll need m.widget support
For https://github.com/vector-im/riot-web/issues/13111
2020-04-09 15:14:07 -06:00
J. Ryan Stinnett
86f39ee0ee Fix read marker visibility for grouped events
The recent "groupers" which extracted out timeline grouping logic forgot to
pass through the last event state for read marker computation. This causes the
read marker to become visible when e.g. returning to room if it was last placed
inside a grouped set of events (currently room creation and membership events).

Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/4059
Related to https://github.com/vector-im/riot-web/issues/12338
2020-04-03 01:14:31 +01:00
Travis Ralston
c86d75693b Fix a number of minor code quality issues
Most of these are complaints from my IDE. Discovered by going through nearly every file looking for React warnings.
2020-03-31 14:05:56 -06:00
J. Ryan Stinnett
520b4c3e65 Add tests for was verified case 2020-03-30 16:33:22 +01:00
J. Ryan Stinnett
b53b5cc45d Add wasCrossSigningVerified in test 2020-03-30 15:24:43 +01:00
Zoe
098df07c67 review feedback 2020-03-30 10:18:47 +01:00
Zoe
4f3d4426ea lint 2020-03-27 15:37:59 +00:00
Zoe
fda533ab48 test for shield behaviour 2020-03-27 15:25:44 +00:00
Bruno Windels
5eaf03c3da update e2e tests to expand local aliases when adding one 2020-03-09 17:03:50 +01:00
Travis Ralston
866ed68615 Ensure DMs tagged outside of account data work in the invite dialog
Fixes https://github.com/vector-im/riot-web/issues/12418

Includes a refactor so we don't need to litter the code with the same magic string for DM tags.
2020-02-24 19:43:49 -07:00
Michael Telatynski
72e5313a5a
Merge pull request #4113 from matrix-org/t3chguy/fix_downloading
Handle file downloading locally in electron rather than sending to browser
2020-02-24 13:37:16 +00:00
Bruno Windels
13b08b5fcc
Revert "Fix escaped markdown passing backslashes through" 2020-02-24 11:27:22 +00:00
Michael Telatynski
d783ce86c8 Use noreferrer in addition to noopener for edge case browsers
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-02-23 22:14:29 +00:00
Zoe
164b355ffe abstract out the check for available target devices 2020-02-18 11:25:19 +00:00
Zoe
23596031db rip foldleft, died of lint issues 2020-02-17 16:00:25 +00:00
Zoe
28df1e28cf Start verification sessions in an E2E DM where possible
Fixes https://github.com/vector-im/riot-web/issues/12187
2020-02-17 15:08:22 +00:00
Hubert Chathi
4a204b715d
Merge pull request #4059 from matrix-org/uhoreg/refactor_event_grouping
refactor event grouping into separate helper classes
2020-02-14 10:35:34 -05:00
Bruno Windels
43f15ab47d
Merge pull request #4008 from BobVul/fix-markdown-escapes
Fix escaped markdown passing backslashes through
2020-02-14 09:18:53 +00:00
Hubert Chathi
908ca6b6ef add test for grouping room creation events 2020-02-13 17:25:54 -05:00
Marco Zehe
8004a35179 Update to use proper quotes and fix code styling. And fix test.
Signed-off-by: Marco Zehe <marcozehe@mailbox.org>
2020-02-12 10:54:08 +01:00
Zoe
9a5663056d lint 2020-02-11 12:06:40 +00:00
Zoe
6b6d612041 Fix error message rendering for key entry
Relates to https://github.com/vector-im/riot-web/issues/12288
2020-02-11 12:02:12 +00:00
Zoe
544479a6ee test code cleaned up slightly 2020-02-04 11:31:16 +00:00
Zoe
150fe7a45a Tests for MKeyVerificationConclusion 2020-02-04 11:25:19 +00:00
BobVul
1df6837649 Missing semicolon 2020-02-04 10:38:43 +11:00
BobVul
fde30577e4 Fix escaped markdown passing backslashes through
Fixes https://github.com/vector-im/riot-web/issues/11230

Signed-off-by: Bob Rao <bob+git@vulpin.com>
2020-01-31 12:33:57 +11:00
J. Ryan Stinnett
5c4b91457e Fix tests 2020-01-30 22:28:56 +00:00
Travis Ralston
9722b34c35
Merge pull request #3906 from matrix-org/travis/user-lists-labs
Remove user lists feature flag, making it the default
2020-01-24 08:57:27 -07:00
Michael Telatynski
d7a4698db8
Merge pull request #3891 from matrix-org/t3chguy/fix_multi_paragraph_formatting
Fix paragraph-awareness of the composer formatting features
2020-01-23 13:31:12 +00:00
Travis Ralston
65450e893c Try and fix e2e tests for new invite dialog 2020-01-22 22:40:02 -07:00
Michael Telatynski
97edb824bc
Merge pull request #3893 from matrix-org/t3chguy/double_slash
Slash Command improvements around sending messages with leading slash
2020-01-22 14:32:09 +00:00
Michael Telatynski
832da062cc Improve trailing spurious breaks + tests 2020-01-22 13:37:27 +00:00
Michael Telatynski
e1e53f567f add more tests 2020-01-22 11:56:27 +00:00
Michael Telatynski
fc724cfe70 fix tests some moar 2020-01-22 11:05:25 +00:00
Michael Telatynski
176605c302 update tests to match new rendering method 2020-01-22 10:49:58 +00:00
Michael Telatynski
9a530a72f6 delint 2020-01-21 15:36:25 +00:00
Michael Telatynski
b2aba6db35 Initial attempt to make toggleInlineFormat paragraph-aware 2020-01-21 15:32:32 +00:00
Michael Telatynski
397e116efb Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/roving 2020-01-20 20:48:11 +00:00
Michael Telatynski
9365a9cb30 Remove lolex where its not needed and move to dev-deps. Remove unused optimist
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-18 01:39:14 +00:00
Michael Telatynski
8ba54f5f7d Don't use expect and jest-mock anymore as they're implicit from jest
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-18 01:38:22 +00:00
Michael Telatynski
4504d9b790 add tests
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-16 03:15:52 +00:00
Travis Ralston
1e70af00a3 Fix GroupView test
It was counting the wrong number of updates for reasons I don't understand.
2020-01-13 20:15:58 -07:00
Travis Ralston
bf6798e109 Appease the linter 2020-01-13 13:28:33 -07:00
Travis Ralston
e66f2a6c3f Revert ES6ification of end-to-end tests and add instructions for Windows
Because the tests are run directly by node, we have to use the CommonJS module syntax. We could run the thing through babel, but then we just have another babel.

Windows instructions are from experience and may not be optimized.
2020-01-10 10:13:41 -07:00
Travis Ralston
aa38946166 Actually define some tests in TextualBody's test
Jest really wants you to do things the right way.
2020-01-09 17:24:13 -07:00
Travis Ralston
4bc5ada50e Fix test bootstrap for new skinning approach 2020-01-09 17:23:46 -07:00
Travis Ralston
54f3288dea Fix imports for tests
This doesn't fix the fact that someone called it "peg".
2020-01-09 17:23:27 -07:00
Travis Ralston
a8c8406ac4 Merge remote-tracking branch 'origin/t3chguy/jest' into travis/sourcemaps 2020-01-09 16:06:46 -07:00
Travis Ralston
dc914774fb Delete files that were conflicting in the merge and deleted on develop 2020-01-09 14:19:19 -07:00
Travis Ralston
fde32f13a5 [CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop 2020-01-09 14:15:09 -07:00
Michael Telatynski
245a68b3ba Merge branches 'develop' and 't3chguy/clean_up_TextualBody' of github.com:matrix-org/matrix-react-sdk into t3chguy/clean_up_TextualBody
 Conflicts:
	yarn.lock
2020-01-09 12:17:21 +00:00
Travis Ralston
59f608ffd6
Merge pull request #3761 from matrix-org/travis/babel7-wp-es6-export
Convert CommonJS exports to ES6 exports
2020-01-08 09:09:11 -07:00
Michael Telatynski
7b91d2056b Attempt to fix e2e tests
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-06 23:50:42 +00:00
Michael Telatynski
bdef54622b delint and add copyright
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-06 14:52:08 +00:00
Michael Telatynski
f1de6d060a Add a regression test for editing events and url previews
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-06 14:38:21 +00:00
Michael Telatynski
c551f2983a Add TextualBody-test.js
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-06 13:28:29 +00:00
Michael Telatynski
c802f9a302 remove unused stale Test Suite
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-06 00:23:19 +00:00
Michael Telatynski
d31c863563 Remove all usages of slate in favour of CIDER
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-06 00:15:48 +00:00
Michael Telatynski
06230e01e3 Fix End-to-End tests for RoomSettings interactivity 2019-12-26 19:36:16 +00:00
Travis Ralston
042bd35d79 Fix MatrixClientPeg imports 2019-12-22 21:15:54 -07:00
Travis Ralston
4aec432b30 Convert the more complicated CommonJS exports to ES6-style 2019-12-22 21:01:03 -07:00
Travis Ralston
344dac4fb9 Convert CommonJS exports to ES6-compatible exports
We use `export default` begrudgingly here. Ideally we'd use just `export`, though this entire SDK expects things to be exported as a default. Instead of breaking everything, we'll sacrifice our export pattern for a smaller diff - a later commit can always do the default export -> regular export conversion.
2019-12-22 21:01:02 -07:00
Michael Telatynski
513ec30ef1 Fix tests v2 2019-12-17 18:02:45 +00:00
Michael Telatynski
f3ca4c0b7c fix tests 2019-12-17 17:54:19 +00:00
Michael Telatynski
da4d72b3c4 delint 2019-12-17 17:34:03 +00:00
Michael Telatynski
937b32663c Migrate away from Legacy React Contexts 2019-12-17 17:26:12 +00:00
Michael Telatynski
b9e22f8141 add delay 2019-12-17 13:11:30 +00:00
Michael Telatynski
409a111b02 wait additional tick 2019-12-17 12:42:47 +00:00
Michael Telatynski
c3415d2121 delint 2019-12-17 12:09:01 +00:00
Michael Telatynski
802092bf9a All tests passing locally. We no longer need Chrome in buildkite 2019-12-17 11:53:18 +00:00
Michael Telatynski
e6d8487302 Fix more tests 2019-12-17 11:47:01 +00:00
Michael Telatynski
ab3fb6581b Down to 7 test failures 2019-12-17 11:24:37 +00:00
Michael Telatynski
0041dae664 26 test failures to go :D 2019-12-16 11:55:01 +00:00
Michael Telatynski
6ad31fe023 30 test failures to go :D 2019-12-16 11:12:48 +00:00
Michael Telatynski
ffa2ac172c delint 2019-12-15 14:09:41 +00:00
Michael Telatynski
18f81d80db Initial jest stuff. Blocked on Babel 7 2019-12-13 13:43:48 +00:00
Travis Ralston
7230d51cca
Merge pull request #3703 from matrix-org/travis/right-panel-v2
Refactor RightPanel to match expected behaviour
2019-12-11 10:50:45 -07:00
Travis Ralston
405b3f6be6 Fix member list not being open for end-to-end tests 2019-12-06 16:33:03 -07:00
Travis Ralston
185830e4f3 Fix end-to-end tests
The right panel needs to be opened manually now.
2019-12-06 14:22:27 -07:00
Michael Telatynski
a63fbbf2db Add tests
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-12-05 00:11:10 +00:00
David Baker
a2e3f64963 Change read markers to use CSS transitions
Removes one of the two places we use Velocity, so we're one step
closer to getting rid of it for good.

Should therefore fix the fact that Velocity is leaking data entries
and therefore <hr> elements.

Hopefully also makes the logic in getEventTiles incrementally simpler,
if still somwewhat byzantine.
2019-11-26 19:06:02 +00:00
Michael Telatynski
d4d51dc61f Rip out the remainder of Bluebird 2019-11-18 10:03:05 +00:00
Michael Telatynski
b3760cdd6e Replace usages of Promise.delay(...) with own utils
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-11-14 14:25:54 +00:00
Michael Telatynski
41f4f3ef82 make end-to-end test failure more verbose
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-11-14 14:04:50 +00:00
Michael Telatynski
168b1b68bb Revert "s/.done(/.then(/ since modern es6 track unhandled promise exceptions"
This reverts commit 09a8fec2
2019-11-12 11:56:21 +00:00
Michael Telatynski
09a8fec261 s/.done(/.then(/ since modern es6 track unhandled promise exceptions 2019-11-12 11:51:23 +00:00
Bruno Windels
616ff5ce76 adjust list item numbers in test that are now preserved 2019-10-22 15:43:40 +02:00
Bruno Windels
fc175a971c
Merge pull request #3537 from matrix-org/bwindels/merge-e2e-tests
Merge end-to-end tests
2019-10-21 08:31:35 +00:00
Bruno Windels
b03ebb964b split up installing static webserver and riot copy
so we can just do the latter for the e2e tests on CI
2019-10-18 17:18:18 +02:00
Bruno Windels
dca968375d
Update test/end-to-end-tests/run.sh 2019-10-18 12:33:42 +00:00
Bruno Windels
3d15026da3
Update test/end-to-end-tests/run.sh 2019-10-18 12:33:32 +00:00
Bruno Windels
15a75737ff
Update test/end-to-end-tests/README.md
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2019-10-18 12:29:09 +00:00
Bruno Windels
76c7f58235
Update test/end-to-end-tests/README.md
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2019-10-18 12:28:58 +00:00
Bruno Windels
142a32b528
Update test/end-to-end-tests/README.md
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2019-10-18 12:28:47 +00:00
Bruno Windels
06e69d114f
Update test/end-to-end-tests/README.md
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2019-10-18 12:28:31 +00:00
Bruno Windels
5025a0ffea
Update test/end-to-end-tests/README.md
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2019-10-18 12:28:12 +00:00
Bruno Windels
8a028029ee
Update test/end-to-end-tests/install.sh
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2019-10-18 12:28:04 +00:00
Bruno Windels
6236909d93
Update test/end-to-end-tests/README.md
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2019-10-18 12:27:52 +00:00
Bruno Windels
683947e0b7
Update test/end-to-end-tests/README.md
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2019-10-18 12:27:43 +00:00
Bruno Windels
15bbf3a999 fix the lint fix 2019-10-10 12:12:13 +02:00
Bruno Windels
4b9a29cb60 put exec perms back on install script 2019-10-10 11:55:31 +02:00
Bruno Windels
6f9604992b copyright 2019-10-10 11:42:59 +02:00
Bruno Windels
645a9d836f install static webserver for server symlinked riot on CI 2019-10-10 11:40:04 +02:00
Bruno Windels
2d848bba29 fix lint 2019-10-09 17:57:55 +02:00
Bruno Windels
ebc2bba0c3 warn if not installed yet when running e2e tests 2019-10-09 17:37:57 +02:00
Bruno Windels
f8358fa4d0 make e2e test safe to run from anywhere 2019-10-09 17:37:41 +02:00
Bruno Windels
59cc36ca65 don't fetch riot/master by default when installing e2e tests 2019-10-09 17:34:40 +02:00
Bruno Windels
de21cb24e0 Merge remote-tracking branch 'e2etests/bwindels/use-cider' into bwindels/merge-e2e-tests 2019-10-09 17:12:50 +02:00
Bruno Windels
cad71913e9 only run riot static server if no riot url has been provided 2019-10-09 16:59:00 +02:00
Bruno Windels
ae38e0b357 Merge remote-tracking branch 'e2etests/bwindels/bigmerge' into bwindels/merge-e2e-tests 2019-10-09 16:55:32 +02:00
Bruno Windels
ca86969f92 move everything to subfolder to merge into react-sdk 2019-10-09 16:52:48 +02:00
Michael Telatynski
aae5bb9f39 Use new React Shallow renderer with hooks support
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-10-09 13:08:16 +02:00
Michael Telatynski
5c960dccb7 delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-10-09 12:51:08 +02:00
Michael Telatynski
efeb6e87c4 Use new React Shallow renderer with hooks support
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-10-09 12:51:08 +02:00
Michael Telatynski
34530843f4 Factor out generic EventListSummary from MELS
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-10-09 12:50:03 +02:00
Travis Ralston
0862ad029d Fix permalinks test 2019-09-30 21:15:31 -06:00
Travis Ralston
fc66e69c02 Rename RoomPermalinkCreator -> Permalinks due to scope
The file handles more than just a RoomPermalinkCreator, so we should name it accordingly.
2019-09-30 20:39:58 -06:00
Travis Ralston
64aa6695f5 Move matrix-to.js to utils/permalinks/RoomPermalinkCreator
Just a little bit of refactoring to make the feature of custom prefixes a bit easier.
2019-09-30 12:16:46 -06:00
Bruno Windels
7f4e070807 fix deserialize unit tests 2019-09-23 15:34:01 +02:00
Michael Telatynski
d5c96b86d4 fix test
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-19 10:31:34 +01:00
Michael Telatynski
02dfdffc4f Fix failing test due to newly added assumption
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-18 14:35:13 +01:00
Travis Ralston
99b8193ce7 Use the new ShallowRenderer over ReactTestUtils
Mostly because the ReactTestUtils renderer doesn't exist anymore.
2019-09-17 14:33:32 -06:00
Michael Telatynski
bf30cfe699 Fix other test
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-11 17:44:04 +01:00
Michael Telatynski
1c7d67e8b3 fix test
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-11 17:44:04 +01:00
Michael Telatynski
70ff2bc9cd Switch to createReactClass: views/rooms and test/components. React 16 :D
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-06 15:04:46 +01:00
Bruno Windels
be79cdddb0 apply autocomplete changes to mock to fix editor unit tests 2019-08-29 18:00:38 +02:00
Bruno Windels
c44fbb73d0 fix bug when replacing range starting at end of previous part 2019-08-28 15:52:39 +02:00
Bruno Windels
994bcb5c85 dont expect rendered to be called from range.replace() anymore
as this is now called from the `transform` method, unused in this test
2019-08-27 16:43:05 +02:00
Bruno Windels
e0b99b5cc8
Merge pull request #3342 from matrix-org/bwindels/cider-replace-emoticons
Auto-replace emoticons with emojis in new composer
2019-08-27 14:40:53 +00:00
Michael Telatynski
bcbd603874
Merge pull request #3345 from matrix-org/t3chguy/react16_3
Switch from react-addons-test-utils to react-dom/test-utils. React 16 :D
2019-08-26 19:44:51 +01:00
Bruno Windels
0e65f71a37 support incrementing/decrementing doc positions with predicate 2019-08-26 16:16:27 +02:00
Bruno Windels
10291bafe0 add support for selecting ranges in the editor model, and replacing them
this to support finding emoticons and replacing them with an emoji
2019-08-26 16:16:27 +02:00
Michael Telatynski
accb0abe2d Switch from react-addons-test-utils to react-dom/test-utils. React 16 :D
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-24 11:47:07 +01:00
Michael Telatynski
e5d3198f53
Merge pull request #3339 from matrix-org/t3chguy/substitute_handle_global
Iterate over all instances of variable/tag for _t substitutions
2019-08-23 19:43:40 +01:00
Michael Telatynski
310457059b [i18n] only append tail if it is actually needed
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-22 18:31:02 +01:00
Michael Telatynski
b5daba9026 Iterate over all instances of variable/tag for _t substitutions
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-22 18:17:08 +01:00
Bruno Windels
5cebce9bbf fix bug detected by tests 2019-08-22 14:41:40 +01:00
Bruno Windels
1dd052d9dd fix test after refactoring 2019-08-22 14:38:24 +01:00
David Baker
a87fb7eaa2 also remove from comment 2019-08-16 15:36:41 +01:00
David Baker
3c4c595f79 remove old serverCaps 2019-08-16 15:27:11 +01:00
David Baker
19c7a4627d fix test 2019-08-16 12:24:52 +01:00
Bruno Windels
299cf8542c Split MessageEditor in edit-specifics & reusable part for main composer 2019-08-05 15:31:18 +02:00
Bruno Windels
af3eebd0a6 add undo steps after word boundary (or capped) when typing or removing 2019-08-02 11:31:01 +02:00
Bruno Windels
07b2e51dce put max step length in constant 2019-08-01 16:27:17 +02:00
Bruno Windels
aa22c90f2c HistoryManager + unit tests 2019-08-01 11:25:04 +02:00
Michael Telatynski
201d7fb448 Merge branches 'develop' and 't3chguy/prop-types' of github.com:matrix-org/matrix-react-sdk into t3chguy/prop-types
# Conflicts:
#	test/components/structures/MessagePanel-test.js
2019-07-31 12:21:00 +01:00