diff options
author | Erik Johnston <erikj@jki.re> | 2017-02-02 11:24:11 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-02 11:24:11 +0000 |
commit | 5ae38b65c1720176dfdae6f654be06c6f88e2084 (patch) | |
tree | 2c303e7eda397feec27f93fe6a5e678c03e0b0e5 /tests/handlers/test_register.py | |
parent | Merge pull request #1872 from matrix-org/erikj/key_changes (diff) | |
parent | Fix email push in pusher worker (diff) | |
download | synapse-5ae38b65c1720176dfdae6f654be06c6f88e2084.tar.xz |
Merge pull request #1875 from matrix-org/erikj/fix_email_push
Fix email push in pusher worker
Diffstat (limited to 'tests/handlers/test_register.py')
-rw-r--r-- | tests/handlers/test_register.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/tests/handlers/test_register.py b/tests/handlers/test_register.py index a4380c48b4..c8cf9a63ec 100644 --- a/tests/handlers/test_register.py +++ b/tests/handlers/test_register.py @@ -41,15 +41,12 @@ class RegistrationTestCase(unittest.TestCase): handlers=None, http_client=None, expire_access_token=True) - self.auth_handler = Mock( + self.macaroon_generator = Mock( generate_access_token=Mock(return_value='secret')) + self.hs.get_macaroon_generator = Mock(return_value=self.macaroon_generator) self.hs.handlers = RegistrationHandlers(self.hs) self.handler = self.hs.get_handlers().registration_handler self.hs.get_handlers().profile_handler = Mock() - self.mock_handler = Mock(spec=[ - "generate_access_token", - ]) - self.hs.get_auth_handler = Mock(return_value=self.auth_handler) @defer.inlineCallbacks def test_user_is_created_and_logged_in_if_doesnt_exist(self): |