diff --git a/tests/rest/admin/test_admin.py b/tests/rest/admin/test_admin.py
index 40571b753a..82ac5991e6 100644
--- a/tests/rest/admin/test_admin.py
+++ b/tests/rest/admin/test_admin.py
@@ -14,7 +14,6 @@
import urllib.parse
from http import HTTPStatus
-from typing import List
from parameterized import parameterized
@@ -23,7 +22,7 @@ from twisted.test.proto_helpers import MemoryReactor
import synapse.rest.admin
from synapse.http.server import JsonResource
from synapse.rest.admin import VersionServlet
-from synapse.rest.client import groups, login, room
+from synapse.rest.client import login, room
from synapse.server import HomeServer
from synapse.util import Clock
@@ -49,93 +48,6 @@ class VersionTestCase(unittest.HomeserverTestCase):
)
-class DeleteGroupTestCase(unittest.HomeserverTestCase):
- servlets = [
- synapse.rest.admin.register_servlets_for_client_rest_resource,
- login.register_servlets,
- groups.register_servlets,
- ]
-
- def prepare(self, reactor: MemoryReactor, clock: Clock, hs: HomeServer) -> None:
- self.admin_user = self.register_user("admin", "pass", admin=True)
- self.admin_user_tok = self.login("admin", "pass")
-
- self.other_user = self.register_user("user", "pass")
- self.other_user_token = self.login("user", "pass")
-
- @unittest.override_config({"experimental_features": {"groups_enabled": True}})
- def test_delete_group(self) -> None:
- # Create a new group
- channel = self.make_request(
- "POST",
- b"/create_group",
- access_token=self.admin_user_tok,
- content={"localpart": "test"},
- )
-
- self.assertEqual(HTTPStatus.OK, channel.code, msg=channel.json_body)
-
- group_id = channel.json_body["group_id"]
-
- self._check_group(group_id, expect_code=HTTPStatus.OK)
-
- # Invite/join another user
-
- url = "/groups/%s/admin/users/invite/%s" % (group_id, self.other_user)
- channel = self.make_request(
- "PUT", url.encode("ascii"), access_token=self.admin_user_tok, content={}
- )
- self.assertEqual(HTTPStatus.OK, channel.code, msg=channel.json_body)
-
- url = "/groups/%s/self/accept_invite" % (group_id,)
- channel = self.make_request(
- "PUT", url.encode("ascii"), access_token=self.other_user_token, content={}
- )
- self.assertEqual(HTTPStatus.OK, channel.code, msg=channel.json_body)
-
- # Check other user knows they're in the group
- self.assertIn(group_id, self._get_groups_user_is_in(self.admin_user_tok))
- self.assertIn(group_id, self._get_groups_user_is_in(self.other_user_token))
-
- # Now delete the group
- url = "/_synapse/admin/v1/delete_group/" + group_id
- channel = self.make_request(
- "POST",
- url.encode("ascii"),
- access_token=self.admin_user_tok,
- content={"localpart": "test"},
- )
-
- self.assertEqual(HTTPStatus.OK, channel.code, msg=channel.json_body)
-
- # Check group returns HTTPStatus.NOT_FOUND
- self._check_group(group_id, expect_code=HTTPStatus.NOT_FOUND)
-
- # Check users don't think they're in the group
- self.assertNotIn(group_id, self._get_groups_user_is_in(self.admin_user_tok))
- self.assertNotIn(group_id, self._get_groups_user_is_in(self.other_user_token))
-
- def _check_group(self, group_id: str, expect_code: int) -> None:
- """Assert that trying to fetch the given group results in the given
- HTTP status code
- """
-
- url = "/groups/%s/profile" % (group_id,)
- channel = self.make_request(
- "GET", url.encode("ascii"), access_token=self.admin_user_tok
- )
-
- self.assertEqual(expect_code, channel.code, msg=channel.json_body)
-
- def _get_groups_user_is_in(self, access_token: str) -> List[str]:
- """Returns the list of groups the user is in (given their access token)"""
- channel = self.make_request("GET", b"/joined_groups", access_token=access_token)
-
- self.assertEqual(HTTPStatus.OK, channel.code, msg=channel.json_body)
-
- return channel.json_body["groups"]
-
-
class QuarantineMediaTestCase(unittest.HomeserverTestCase):
"""Test /quarantine_media admin API."""
diff --git a/tests/rest/client/test_groups.py b/tests/rest/client/test_groups.py
deleted file mode 100644
index e067cf825c..0000000000
--- a/tests/rest/client/test_groups.py
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2021 The Matrix.org Foundation C.I.C.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-from synapse.rest.client import groups, room
-
-from tests import unittest
-from tests.unittest import override_config
-
-
-class GroupsTestCase(unittest.HomeserverTestCase):
- user_id = "@alice:test"
- room_creator_user_id = "@bob:test"
-
- servlets = [room.register_servlets, groups.register_servlets]
-
- @override_config({"enable_group_creation": True})
- def test_rooms_limited_by_visibility(self) -> None:
- group_id = "+spqr:test"
-
- # Alice creates a group
- channel = self.make_request("POST", "/create_group", {"localpart": "spqr"})
- self.assertEqual(channel.code, 200, msg=channel.text_body)
- self.assertEqual(channel.json_body, {"group_id": group_id})
-
- # Bob creates a private room
- room_id = self.helper.create_room_as(self.room_creator_user_id, is_public=False)
- self.helper.auth_user_id = self.room_creator_user_id
- self.helper.send_state(
- room_id, "m.room.name", {"name": "bob's secret room"}, tok=None
- )
- self.helper.auth_user_id = self.user_id
-
- # Alice adds the room to her group.
- channel = self.make_request(
- "PUT", f"/groups/{group_id}/admin/rooms/{room_id}", {}
- )
- self.assertEqual(channel.code, 200, msg=channel.text_body)
- self.assertEqual(channel.json_body, {})
-
- # Alice now tries to retrieve the room list of the space.
- channel = self.make_request("GET", f"/groups/{group_id}/rooms")
- self.assertEqual(channel.code, 200, msg=channel.text_body)
- self.assertEqual(
- channel.json_body, {"chunk": [], "total_room_count_estimate": 0}
- )
|
