0a209afdc2
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18089
...
Conflicts:
res/css/structures/_SpaceHierarchy.scss
src/components/structures/SpaceHierarchy.tsx
src/i18n/strings/en_EN.json
2021-08-12 11:41:03 +01:00
8216a35a56
remove spurious mxclient stub
2021-08-11 21:02:30 +01:00
881cac0d21
Merge remote-tracking branch 'upstream/develop' into fix/ringing-sound/15591
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 16:30:03 +02:00
c9c8177f58
Start a call immediately after creating a room via the dial pad ( #6529 )
2021-08-04 09:46:39 +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
a18f41ceed
Fix tests
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-03 15:43:56 +02:00
2a378f30b7
Attempt to fix tests
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-03 15:38:12 +02:00
d459dbe700
Refactor Space Hierarchy stuff in preparation for pagination
2021-07-29 17:35:15 +01:00
6f37e8b223
Use getChildren instead of getSpaceSummary as MSC2946 has moved on
2021-07-29 12:16:59 +01:00
de42a00ca4
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
...
Conflicts:
src/components/views/avatars/RoomAvatar.tsx
test/stores/SpaceStore-test.ts
test/test-utils.js
2021-07-19 16:47:31 +01:00
831c482371
Stub out MatrixClient::isUserIgnored for tests
2021-07-15 18:17:07 +01:00
04c923bd75
fix tests by including client field on the Room stub and stubbing getJoinedMemberCount
2021-07-06 11:35:56 +01:00
9d8acd1af0
stub getJoinRule
2021-07-06 10:44:09 +01:00
0ca4a958f7
fix getCapabilities stub
2021-07-06 10:34:50 +01:00
3301763f12
stub getCapabilities in tests
2021-07-06 10:19:33 +01:00
ae0a8b8da4
Auto-fix lint errors
2021-06-29 13:11:58 +01:00
a06306d560
Merge branch 'develop' into improved-forwarding-ui
2021-06-05 11:04:17 -04:00
5b2dacd99e
Adapt for js-sdk MatrixClient conversion to TS
...
For https://github.com/matrix-org/matrix-js-sdk/pull/1718
2021-06-01 21:36:28 -06:00
992861a1cd
Fix forward dialog tests
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-01 20:36:28 -04:00
678b298bab
Merge branch 'develop' into improved-forwarding-ui
2021-05-19 12:39:48 -04:00
aa4984019c
Merge pull request #6061 from jaiwanth-v/update-memberlist-invite
...
Update MemberList to reflect changes for invite permission change
2021-05-19 17:35:58 +01:00
88d3706c04
mock getMembers on mkStubRoom
2021-05-19 12:34:27 +01:00
506a798961
Add getMember mock
2021-05-19 15:19:56 +05:30
454df8947b
Add mock for new client method
2021-05-18 13:46:47 +01:00
e798b36f1d
Decorate forward dialog room avatars
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-16 08:39:22 -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
c95c1aeffd
Merge pull request #5886 from matrix-org/dbkr/asserted_identity
...
Support MSC3086 asserted identity
2021-04-28 09:47:40 +01:00
f18a24025a
Merge branch 'develop' into t3chguy/fix/17022
2021-04-27 11:16:02 +01:00
4446022327
Add automatic space switching tests
2021-04-23 14:45:22 +01:00
dc3d05bc88
Test for asserted identity
...
This is out first CallHandler test(!) Switches react-sdk to use
createCall on the client object so we can stub this out in the test.
Add a bunch more stubs to the test client.
There's more stuff in this test that has scope to be used more
widely, like waiting for a certain dispatch and mocking out rooms
with particular sets of users in them: we could consider moving these
out to test utils if we wanted.
2021-04-23 14:39:39 +01:00
a12cefee8e
Tweak some tests
2021-04-23 12:19:08 +01:00
fba7465ad4
Initial SpaceStore tests work
2021-04-22 14:45:13 +01:00
a53696ff5e
Fix tests
2021-04-21 16:53:29 -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
591ccabab9
Remove a bunch of useless 'use strict' definitions
2021-03-08 20:26:08 -07: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
54e41b5f32
fix tests
2020-11-05 16:27:41 +00:00
965debf442
extend mockClient in testutils
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-07 00:09:48 +01: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
908ca6b6ef
add test for grouping room creation events
2020-02-13 17:25:54 -05: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
c551f2983a
Add TextualBody-test.js
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-06 13:28:29 +00:00
da4d72b3c4
delint
2019-12-17 17:34:03 +00:00
937b32663c
Migrate away from Legacy React Contexts
2019-12-17 17:26:12 +00:00
c3415d2121
delint
2019-12-17 12:09:01 +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
Michael Telatynski