diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2020-02-19 10:40:27 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-19 10:40:27 +0000 |
| commit | 880aaac1d82695b1a89f22f1f86c7f295ca205e0 (patch) | |
| tree | c6792fce676c5773434d9446a911e06e02f829e1 /tests/rest | |
| parent | Tiny optimisation for _get_handler_for_request (#6950) (diff) | |
| download | synapse-880aaac1d82695b1a89f22f1f86c7f295ca205e0.tar.xz | |
Move MSC2432 stuff onto unstable prefix (#6948)
it's not in the spec yet, so needs to be unstable. Also add a feature flag for it. Also add a test for admin users.
Diffstat (limited to 'tests/rest')
| -rw-r--r-- | tests/rest/client/v1/test_rooms.py | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/tests/rest/client/v1/test_rooms.py b/tests/rest/client/v1/test_rooms.py index fb08a45d27..f82655677c 100644 --- a/tests/rest/client/v1/test_rooms.py +++ b/tests/rest/client/v1/test_rooms.py @@ -1729,8 +1729,7 @@ class ContextTestCase(unittest.HomeserverTestCase): self.assertEqual(events_after[1].get("content"), {}, events_after[1]) -class DirectoryTestCase(unittest.HomeserverTestCase): - +class RoomAliasListTestCase(unittest.HomeserverTestCase): servlets = [ synapse.rest.admin.register_servlets_for_client_rest_resource, directory.register_servlets, @@ -1756,6 +1755,16 @@ class DirectoryTestCase(unittest.HomeserverTestCase): res = self._get_aliases(user_tok, expected_code=403) self.assertEqual(res["errcode"], "M_FORBIDDEN") + def test_admin_user(self): + alias1 = self._random_alias() + self._set_alias_via_directory(alias1) + + self.register_user("user", "test", admin=True) + user_tok = self.login("user", "test") + + res = self._get_aliases(user_tok) + self.assertEqual(res["aliases"], [alias1]) + def test_with_aliases(self): alias1 = self._random_alias() alias2 = self._random_alias() @@ -1770,7 +1779,8 @@ class DirectoryTestCase(unittest.HomeserverTestCase): """Calls the endpoint under test. returns the json response object.""" request, channel = self.make_request( "GET", - "/_matrix/client/r0/rooms/%s/aliases" % (self.room_id,), + "/_matrix/client/unstable/org.matrix.msc2432/rooms/%s/aliases" + % (self.room_id,), access_token=access_token, ) self.render(request) |