summary refs log tree commit diff
path: root/tests/rest
diff options
context:
space:
mode:
authorKrombel <krombel@krombel.de>2018-03-14 16:45:37 +0100
committerKrombel <krombel@krombel.de>2018-03-14 16:45:37 +0100
commit91ea0202e6f4a519e332a6c456aedfe4b7d627c9 (patch)
treebc41e36686051862440489d5762e6cd42da64966 /tests/rest
parentMerge pull request #2995 from matrix-org/erikj/enable_membership_worker (diff)
downloadsynapse-91ea0202e6f4a519e332a6c456aedfe4b7d627c9.tar.xz
move handling of auto_join_rooms to RegisterHandler
Currently the handling of auto_join_rooms only works when a user
registers itself via public register api. Registrations via
registration_shared_secret and ModuleApi do not work

This auto_joins the users in the registration handler which enables
the auto join feature for all 3 registration paths.

This is related to issue #2725

Signed-Off-by: Matthias Kesler <krombel@krombel.de>
Diffstat (limited to 'tests/rest')
-rw-r--r--tests/rest/client/v1/test_events.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/rest/client/v1/test_events.py b/tests/rest/client/v1/test_events.py
index 2b89c0a3c7..a8d09600bd 100644
--- a/tests/rest/client/v1/test_events.py
+++ b/tests/rest/client/v1/test_events.py
@@ -123,6 +123,7 @@ class EventStreamPermissionsTestCase(RestTestCase):
         self.ratelimiter.send_message.return_value = (True, 0)
         hs.config.enable_registration_captcha = False
         hs.config.enable_registration = True
+        hs.config.auto_join_rooms = []
 
         hs.get_handlers().federation_handler = Mock()