PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
30514 commits 1 branch 0 tags 338 MiB
Commit graph

553 commits

Author SHA1 Message Date
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