diff options
author | David Baker <dbkr@users.noreply.github.com> | 2017-10-17 11:45:49 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-17 11:45:49 +0100 |
commit | 4e242b3e20038a2b9253c945dd40980cb381ebfc (patch) | |
tree | e5aa8f73504b6be6f8b7c3ce033c2a7ed9424217 /tests | |
parent | Merge pull request #2544 from matrix-org/luke/groups-invited-users (diff) | |
parent | Fix test (diff) | |
download | synapse-4e242b3e20038a2b9253c945dd40980cb381ebfc.tar.xz |
Merge pull request #2545 from matrix-org/dbkr/auto_join_rooms
Add config option to auto-join new users to rooms
Diffstat (limited to 'tests')
-rw-r--r-- | tests/rest/client/v2_alpha/test_register.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/rest/client/v2_alpha/test_register.py b/tests/rest/client/v2_alpha/test_register.py index b6173ab2ee..821c735528 100644 --- a/tests/rest/client/v2_alpha/test_register.py +++ b/tests/rest/client/v2_alpha/test_register.py @@ -47,6 +47,7 @@ class RegisterRestServletTestCase(unittest.TestCase): self.hs.get_auth_handler = Mock(return_value=self.auth_handler) self.hs.get_device_handler = Mock(return_value=self.device_handler) self.hs.config.enable_registration = True + self.hs.config.auto_join_rooms = [] # init the thing we're testing self.servlet = RegisterRestServlet(self.hs) |