OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Move PublicRoomsManager tests to ModuleApi

pull/8292/head
Andrew Morgan 2020-09-11 17:01:02 +01:00
parent f5b6246f3a
commit e768fae0c0
2 changed files with 41 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
tests/module_api/test_api.py
View File

@ -12,13 +12,20 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from synapse.module_api import ModuleApi from synapse.module_api import ModuleApi
from synapse.rest import admin
from synapse.rest.client.v1 import login, room
from tests.unittest import HomeserverTestCase from tests.unittest import HomeserverTestCase
class ModuleApiTestCase(HomeserverTestCase): class ModuleApiTestCase(HomeserverTestCase):
servlets = [
admin.register_servlets,
login.register_servlets,
room.register_servlets,
]
def prepare(self, reactor, clock, homeserver): def prepare(self, reactor, clock, homeserver):
self.store = homeserver.get_datastore() self.store = homeserver.get_datastore()
self.module_api = ModuleApi(homeserver, homeserver.get_auth_handler()) self.module_api = ModuleApi(homeserver, homeserver.get_auth_handler())
@ -52,3 +59,36 @@ class ModuleApiTestCase(HomeserverTestCase):
# Check that the displayname was assigned # Check that the displayname was assigned
displayname = self.get_success(self.store.get_profile_displayname("bob")) displayname = self.get_success(self.store.get_profile_displayname("bob"))
self.assertEqual(displayname, "Bobberino") self.assertEqual(displayname, "Bobberino")
def test_public_rooms(self):
"""Tests that a room can be added and removed from the public rooms list,
as well as have its public rooms directory state queried.
"""
# Create a user and room to play with
user_id = self.register_user("kermit", "monkey")
tok = self.login("kermit", "monkey")
room_id = self.helper.create_room_as(user_id, tok=tok)
# The room should not currently be in the public rooms directory
is_in_public_rooms = self.get_success(
self.module_api.room_is_in_public_directory(room_id)
)
self.assertFalse(is_in_public_rooms)
# Let's try adding it to the public rooms directory
self.get_success(self.module_api.add_room_to_public_directory(room_id))
# And checking whether it's in there...
is_in_public_rooms = self.get_success(
self.module_api.room_is_in_public_directory(room_id)
)
self.assertTrue(is_in_public_rooms)
# Let's remove it again
self.get_success(self.module_api.remove_room_from_public_directory(room_id))
# Should be gone
is_in_public_rooms = self.get_success(
self.module_api.room_is_in_public_directory(room_id)
)
self.assertFalse(is_in_public_rooms)

35
tests/rest/client/third_party_rules.py
View File

@ -12,7 +12,6 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from synapse.events.third_party_rules import PublicRoomsManager
from synapse.rest import admin from synapse.rest import admin
from synapse.rest.client.v1 import login, room from synapse.rest.client.v1 import login, room
from synapse.types import Requester from synapse.types import Requester
@ -85,37 +84,3 @@ class ThirdPartyRulesTestCase(unittest.HomeserverTestCase):
) )
self.render(request) self.render(request)
self.assertEquals(channel.result["code"], b"403", channel.result) self.assertEquals(channel.result["code"], b"403", channel.result)
def test_public_rooms_manager(self):
"""Tests that a room can be added and removed from the public rooms list,
as well as have its public rooms directory state queried.
"""
public_rooms_manager = PublicRoomsManager(self.hs)
# The room should not currently be in the public rooms directory
is_in_public_rooms = self.get_success(
public_rooms_manager.room_is_in_public_directory(self.room_id)
)
self.assertFalse(is_in_public_rooms)
# Let's try adding it to the public rooms directory
self.get_success(
public_rooms_manager.add_room_to_public_directory(self.room_id)
)
# And checking whether it's in there...
is_in_public_rooms = self.get_success(
public_rooms_manager.room_is_in_public_directory(self.room_id)
)
self.assertTrue(is_in_public_rooms)
# Let's remove it again
self.get_success(
public_rooms_manager.remove_room_from_public_directory(self.room_id)
)
# Should be gone
is_in_public_rooms = self.get_success(
public_rooms_manager.room_is_in_public_directory(self.room_id)
)
self.assertFalse(is_in_public_rooms)