a688e5b8b3
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088
...
Conflicts:
src/components/structures/LoggedInView.tsx
src/stores/SpaceStore.tsx
2021-09-06 11:41:09 +01:00
95d1b06abb
Make composer able to reply in thread or in room timeline
2021-09-01 12:12:40 +01:00
6b9dc40ad6
delint test
2021-08-11 16:12:08 +01:00
da110855f0
delint and remove groups-specific tests and setups
2021-08-11 15:36:35 +01:00
28f5dc483b
Update eslint plugin & fix silly indenting
...
As per https://github.com/matrix-org/eslint-plugin-matrix-org/pull/15
this caused a bunch of silly indenting to creep in, so this fixes it
back to the previous style.
2021-08-03 17:07:37 +01:00
eefadf6a46
Fix tests
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-07-16 15:30:26 -04:00
f5f4be88f0
Update tests to expect LinkPreviewGroup behaviour
2021-07-12 08:34:26 +01:00
00a3f5d469
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into revert-6135-t3chguy/fix/17494
2021-07-08 13:29:10 +01:00
4a6af5a4d7
fix test missing required prop
2021-07-07 18:12:31 +01:00
b36a727a09
Fourth batch of burning
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 18:15:05 +02:00
b17d72c399
fix duplicate import
2021-07-02 14:54:10 +01:00
82119a08f7
Merge branch 'develop' into t3chguy/ts/11
2021-07-02 11:03:54 +01:00
88f691776f
Use sleep from js-sdk as no point duplicating it
2021-07-01 22:55:27 +01:00
543fe6382d
Fix linting in tests
...
Or in the case of one test, disbale just the one rule it breaks
2021-07-01 20:54:04 +01:00
ee9be5438e
eslint --fix
2021-07-01 20:43:05 +01:00
e768ecb3d0
Typescript conversion of Composer components and more
2021-06-30 13:01:26 +01:00
ae0a8b8da4
Auto-fix lint errors
2021-06-29 13:11:58 +01:00
0df6200dd0
Convert MemberList-test to TS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-23 16:00:13 +02:00
a52dd57eb2
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17529
...
Conflicts:
package.json
yarn.lock
2021-06-15 13:59:54 +01:00
6e0a908c59
Merge branch 'develop' into gsouquet/react-17
2021-06-09 12:01:35 +01:00
d492ee4d8a
Update Enzyme adapter name
2021-06-09 11:57:29 +01:00
e891d18fa2
Add my email to my copyright notices
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-05 21:41:28 -04:00
a06306d560
Merge branch 'develop' into improved-forwarding-ui
2021-06-05 11:04:17 -04:00
d7a5547d80
use Intl.Collator over String.prototype.localeCompare for better performance
2021-06-02 10:42:17 +01:00
0b7d3f007a
Remove react-beautiful-dnd
2021-06-01 17:35:31 +01:00
121ed5eba9
Pass Matrix client around as matrixClient
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-24 08:51:04 -04:00
400917623c
Make myself the copyright holder for forward dialog code
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-24 08:33:28 -04:00
7a04502151
Iterate on forward dialog design feedback
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-21 12:41:29 -04:00
678b298bab
Merge branch 'develop' into improved-forwarding-ui
2021-05-19 12:39:48 -04:00
506a798961
Add getMember mock
2021-05-19 15:19:56 +05:30
503301aa89
Make rooms in ForwardDialog clickable
...
…so that you can jump to a room easily once you've forwarded a message
there.
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-10 13:00:06 -04:00
5c10e1e574
Fix lints
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-10 01:16:37 -04:00
eb779cd3d8
Test that forward buttons are disabled for rooms without permission
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-10 01:10:41 -04:00
35cf0e1c7e
Find components by name rather than class in ForwardDialog test
...
It makes things shorter and more readable!
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-10 01:10:39 -04:00
eb07f1fb86
Test that ForwardDialog can render replies
...
Previously ForwardDialog was not giving its EventTile message preview
the information it needed to render a ReplyThread. This was a bit tricky
to fix since we were pulling a fake event out of thin air, so this
ensures it doesn't regress.
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-10 00:54:00 -04:00
74925b2c6d
Test ForwardDialog
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-08 21:11:06 -04:00
232b87a3b4
Improve formatting
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-29 19:57:02 +02:00
46bfbbadf9
Enable indent rule and fix indent
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-27 17:23:27 +02:00
a53696ff5e
Fix tests
2021-04-21 16:53:29 -06:00
a0049f956d
Patch over legacy Groups test
2021-03-31 23:51:17 -06:00
5d9b36afc1
Fix tests
2021-03-25 23:47:41 -06:00
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
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
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
f45510ed25
Fix test assuming too much about the underlying calls
2021-02-19 13:08:30 +00:00
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
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
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
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
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
97a551c04a
Fix test
2021-01-14 17:39:58 +00:00
6371a4abd1
Fix tests
...
Remove stray file extensions in includes and update shared instance
name.
2021-01-13 16:02:35 +00:00
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
0c85cb587d
Merge branch 'develop' into emoji_quick_shortcut
2020-12-04 11:05:50 -05:00
ba8d02a808
add quick shortcut emoji feature and tests
...
Signed-off-by: macekj <macekj@umich.edu>
2020-11-17 17:36:58 -05:00
3f9f1d03c8
stubbed isGuest for unit tests
2020-10-29 13:22:09 +00:00
b2d04deb83
fix tests for the new sessionStorage key
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-08 10:04:01 +01:00
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
7bd5e3fa31
Move security-related dialogs to a common directory
2020-09-16 15:03:06 +01:00
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
38e93469d3
Fix broken test
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-23 09:01:44 +01:00
2dfd636a9e
Appease the linter
2020-07-17 16:28:49 -06:00
c9b0b3b31d
RoomSublist2 -> RoomSublist
2020-07-17 15:46:46 -06:00
96065ae982
RoomTile2 -> RoomTile
2020-07-17 15:43:29 -06:00
a7c18bfbfa
RoomList2 -> RoomList
2020-07-17 15:27:49 -06:00
2b15ba21dd
Rename RoomListStore file
2020-07-17 15:11:34 -06:00
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
3826d81358
Enable test mode
2020-07-10 11:05:56 -06:00
bba8197592
Use the new layout store
2020-07-09 22:40:34 -06:00
75dbd5f1d4
Merge branch 'develop' into travis/room-list/enable
2020-07-09 22:28:16 -06:00
121e41d20b
Remove irrelevant function
2020-07-07 16:20:53 -06:00
5ace405062
The linter will never be appeased
2020-07-07 16:01:42 -06:00
85af3ebcc0
Lie about DMs in tests
2020-07-07 15:58:15 -06:00
044c223899
Remove debug
2020-07-07 15:53:12 -06:00
767db73853
Appease the linter
2020-07-07 15:50:04 -06:00
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
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
99734dcfe8
please work
2020-07-07 17:11:14 +01:00
af2b826136
Please fix test
2020-07-07 16:57:56 +01:00
2969820371
LINT
2020-06-26 20:31:22 +01:00
0579c9f748
Fix tests
2020-06-26 20:25:38 +01:00
73d966443c
fix tests
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-24 14:25:31 +01:00
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
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
adec5a4f92
fix test
2020-05-20 15:09:10 +01:00
e79959a4ec
try fix tests
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-15 00:31:30 +01:00
2b4c19e9ba
Merge branch 'travis/dispatcher-types' into travis/room-list-2
2020-05-14 13:40:37 -06:00
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
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
fd25170c57
lint test
2020-04-27 11:51:55 +01:00
18db25f601
Fix test
2020-04-27 11:51:55 +01:00
e942a35525
Fixxy
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-16 14:09:41 +01:00
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
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
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
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
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
9a5663056d
lint
2020-02-11 12:06:40 +00:00
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
544479a6ee
test code cleaned up slightly
2020-02-04 11:31:16 +00:00
150fe7a45a
Tests for MKeyVerificationConclusion
2020-02-04 11:25:19 +00:00
5c4b91457e
Fix tests
2020-01-30 22:28:56 +00:00
e1e53f567f
add more tests
2020-01-22 11:56:27 +00:00
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
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
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
54f3288dea
Fix imports for tests
...
This doesn't fix the fact that someone called it "peg".
2020-01-09 17:23:27 -07:00
a8c8406ac4
Merge remote-tracking branch 'origin/t3chguy/jest' into travis/sourcemaps
2020-01-09 16:06:46 -07:00
dc914774fb
Delete files that were conflicting in the merge and deleted on develop
2020-01-09 14:19:19 -07:00
fde32f13a5
[CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop
2020-01-09 14:15:09 -07:00
bdef54622b
delint and add copyright
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-06 14:52:08 +00:00
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
c551f2983a
Add TextualBody-test.js
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-06 13:28:29 +00:00
c802f9a302
remove unused stale Test Suite
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-06 00:23:19 +00:00
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
042bd35d79
Fix MatrixClientPeg imports
2019-12-22 21:15:54 -07:00
513ec30ef1
Fix tests v2
2019-12-17 18:02:45 +00:00
f3ca4c0b7c
fix tests
2019-12-17 17:54:19 +00:00
b9e22f8141
add delay
2019-12-17 13:11:30 +00:00
c3415d2121
delint
2019-12-17 12:09:01 +00:00
e6d8487302
Fix more tests
2019-12-17 11:47:01 +00:00
ab3fb6581b
Down to 7 test failures
2019-12-17 11:24:37 +00:00
6ad31fe023
30 test failures to go :D
2019-12-16 11:12:48 +00:00
18f81d80db
Initial jest stuff. Blocked on Babel 7
2019-12-13 13:43:48 +00:00
d4d51dc61f
Rip out the remainder of Bluebird
2019-11-18 10:03:05 +00:00
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
168b1b68bb
Revert "s/.done(/.then(/ since modern es6 track unhandled promise exceptions"
...
This reverts commit 09a8fec2
2019-11-12 11:56:21 +00:00
09a8fec261
s/.done(/.then(/ since modern es6 track unhandled promise exceptions
2019-11-12 11:51:23 +00:00
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
5c960dccb7
delint
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-10-09 12:51:08 +02:00
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
34530843f4
Factor out generic EventListSummary from MELS
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-10-09 12:50:03 +02:00
99b8193ce7
Use the new ShallowRenderer over ReactTestUtils
...
Mostly because the ReactTestUtils renderer doesn't exist anymore.
2019-09-17 14:33:32 -06:00
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
ba5238d86a
Finally fix tests
2019-07-11 15:01:56 -06:00
698fd3b897
Hopefully actually make the tests happy
2019-07-11 14:45:36 -06:00
a9419135aa
Fix tests to use UIA proper
2019-07-11 14:38:28 -06:00
959f8fd844
Fix tests
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-07-10 21:58:08 +01:00
8b16f91b3d
fix karma tests?
2019-06-13 15:50:23 +02:00
b12362dd37
Disable dragging tests for room list
...
We don't support dragging, so don't test it.
2019-02-13 19:51:34 -07:00
d20bdbbc1a
Disable room settings tests
2019-01-28 14:11:10 -07:00
20b7debcaf
Remove support for team servers
2019-01-25 16:13:30 -06:00
9470424bcb
Enable linting for all auth related files
2019-01-23 18:32:36 -06:00
29be3ee4b5
Rename login directory to auth
2019-01-21 17:45:55 -06:00
0ebde5266e
Appease the linter again
2019-01-03 22:40:44 -07:00
f59625f7bd
Fix last active test
...
Time is backwards from all the other tests: larger is older, so we want LessThanOrEqual. Also ensure all the power levels are the same to prevent the sort algorithm from running a PL ordering.
2019-01-03 22:24:24 -07:00
34d5870a03
Appease the linter
2019-01-03 22:07:09 -07:00
77dfba8a22
Add unit tests for MemberList
...
Particularly the ordering of the tiles.
2019-01-03 21:55:52 -07:00
0bb35944f9
replace expect.createSpy() with jest.fn()
...
Signed-off-by: Stephen Solka <stephen0q@gmail.com>
2019-01-02 16:59:48 -06:00
c3185a4cdb
breaking changes from expect upgrade
...
Signed-off-by: Stephen Solka <stephen0q@gmail.com>
2019-01-02 16:59:48 -06:00
Michael Telatynski