tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Rejig testcase to make it more extensible

Browse source
This commit is contained in:
Erik Johnston 2019-03-21 11:02:11 +00:00
parent 9c9e618b93
commit 4a8a1ac962
1 changed files with 22 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
tests/rest/client/v1/test_admin.py
View file

@ -366,38 +366,43 @@ class ShutdownRoomTestCase(unittest.HomeserverTestCase):
self.event_creation_handler = hs.get_event_creation_handler() self.event_creation_handler = hs.get_event_creation_handler()
hs.config.user_consent_version = "1" hs.config.user_consent_version = "1"
self._consent_uri_builder = Mock() consent_uri_builder = Mock()
self._consent_uri_builder.build_user_consent_uri.return_value = ( consent_uri_builder.build_user_consent_uri.return_value = (
"http://example.com" "http://example.com"
) )
self.event_creation_handler._consent_uri_builder = consent_uri_builder
self.store = hs.get_datastore() self.store = hs.get_datastore()
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")
# Mark the admin user as having consented
self.get_success(
self.store.user_set_consent_version(self.admin_user, "1"),
)
def test_shutdown_room_conset(self): def test_shutdown_room_conset(self):
admin_user = self.register_user("admin", "pass", admin=True) self.event_creation_handler._block_events_without_consent_error = None
admin_user_tok = self.login("admin", "pass")
other_user = self.register_user("user", "pass") room_id = self.helper.create_room_as(self.other_user, tok=self.other_user_token)
other_user_token = self.login("user", "pass")
room_id = self.helper.create_room_as(other_user, tok=other_user_token)
# Assert one user in room # Assert one user in room
users_in_room = self.get_success( users_in_room = self.get_success(
self.store.get_users_in_room(room_id), self.store.get_users_in_room(room_id),
) )
self.assertEqual([other_user], users_in_room) self.assertEqual([self.other_user], users_in_room)
# Enable require consent to send events # Enable require consent to send events
self.event_creation_handler._block_events_without_consent_error = "Error" self.event_creation_handler._block_events_without_consent_error = "Error"
self.event_creation_handler._consent_uri_builder = self._consent_uri_builder
# Assert that the user is getting consent error # Assert that the user is getting consent error
self.helper.send(room_id, body="foo", tok=other_user_token, expect_code=403) self.helper.send(
room_id,
# Mark the admin user as having consented body="foo", tok=self.other_user_token, expect_code=403,
self.get_success(
self.store.user_set_consent_version(admin_user, "1"),
) )
# Test that the admin can still send shutdown # Test that the admin can still send shutdown
@ -405,8 +410,8 @@ class ShutdownRoomTestCase(unittest.HomeserverTestCase):
request, channel = self.make_request( request, channel = self.make_request(
"POST", "POST",
url.encode('ascii'), url.encode('ascii'),
json.dumps({"new_room_user_id": admin_user}), json.dumps({"new_room_user_id": self.admin_user}),
access_token=admin_user_tok, access_token=self.admin_user_tok,
) )
self.render(request) self.render(request)