diff options
| author | Neil Johnson <neil@matrix.org> | 2018-11-28 11:24:57 +0000 |
|---|---|---|
| committer | Amber Brown <hawkowl@atleastfornow.net> | 2018-11-28 22:24:57 +1100 |
| commit | 7039ece8fb633b97cd6166be636bae71fb3aa3c6 (patch) | |
| tree | 0c90754b48070b8b489d9cdd624a806573205cdd /tests/handlers | |
| parent | Report combined coverage to codecov (#4225) (diff) | |
| download | synapse-7039ece8fb633b97cd6166be636bae71fb3aa3c6.tar.xz | |
Neilj/fix autojoin (#4223)
* Fix auto join failures for servers that require user consent * Fix auto join failures for servers that require user consent
Diffstat (limited to 'tests/handlers')
| -rw-r--r-- | tests/handlers/test_register.py | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/tests/handlers/test_register.py b/tests/handlers/test_register.py index 3e9a190727..90a2a76475 100644 --- a/tests/handlers/test_register.py +++ b/tests/handlers/test_register.py @@ -150,7 +150,6 @@ class RegistrationTestCase(unittest.TestCase): self.hs.config.auto_join_rooms = [room_alias_str] res = yield self.handler.register(localpart='jeff') rooms = yield self.store.get_rooms_for_user(res[0]) - directory_handler = self.hs.get_handlers().directory_handler room_alias = RoomAlias.from_string(room_alias_str) room_id = yield directory_handler.get_association(room_alias) @@ -184,3 +183,14 @@ class RegistrationTestCase(unittest.TestCase): res = yield self.handler.register(localpart='jeff') rooms = yield self.store.get_rooms_for_user(res[0]) self.assertEqual(len(rooms), 0) + + @defer.inlineCallbacks + def test_auto_create_auto_join_where_no_consent(self): + self.hs.config.user_consent_at_registration = True + self.hs.config.block_events_without_consent_error = "Error" + room_alias_str = "#room:test" + self.hs.config.auto_join_rooms = [room_alias_str] + res = yield self.handler.register(localpart='jeff') + yield self.handler.post_consent_actions(res[0]) + rooms = yield self.store.get_rooms_for_user(res[0]) + self.assertEqual(len(rooms), 0) |