diff options
author | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-08-20 17:44:46 +0100 |
---|---|---|
committer | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-08-20 17:44:46 +0100 |
commit | b1e35eabf240c6231e5dcc6e8022f537e236829d (patch) | |
tree | f01b04d22e4d487bd61c96768154e5e4b6498b10 /tests/handlers | |
parent | Merge pull request #229 from matrix-org/auth (diff) | |
parent | Fix bad merge (diff) | |
download | synapse-b1e35eabf240c6231e5dcc6e8022f537e236829d.tar.xz |
Merge pull request #240 from matrix-org/refresh
/tokenrefresh POST endpoint
Diffstat (limited to 'tests/handlers')
-rw-r--r-- | tests/handlers/test_auth.py (renamed from tests/handlers/test_register.py) | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/handlers/test_register.py b/tests/handlers/test_auth.py index 91cc90242f..978e4d0d2e 100644 --- a/tests/handlers/test_register.py +++ b/tests/handlers/test_auth.py @@ -16,27 +16,27 @@ import pymacaroons from mock import Mock, NonCallableMock -from synapse.handlers.register import RegistrationHandler +from synapse.handlers.auth import AuthHandler from tests import unittest from tests.utils import setup_test_homeserver from twisted.internet import defer -class RegisterHandlers(object): +class AuthHandlers(object): def __init__(self, hs): - self.registration_handler = RegistrationHandler(hs) + self.auth_handler = AuthHandler(hs) -class RegisterTestCase(unittest.TestCase): +class AuthTestCase(unittest.TestCase): @defer.inlineCallbacks def setUp(self): self.hs = yield setup_test_homeserver(handlers=None) - self.hs.handlers = RegisterHandlers(self.hs) + self.hs.handlers = AuthHandlers(self.hs) def test_token_is_a_macaroon(self): self.hs.config.macaroon_secret_key = "this key is a huge secret" - token = self.hs.handlers.registration_handler.generate_token("some_user") + token = self.hs.handlers.auth_handler.generate_access_token("some_user") # Check that we can parse the thing with pymacaroons macaroon = pymacaroons.Macaroon.deserialize(token) # The most basic of sanity checks @@ -47,7 +47,7 @@ class RegisterTestCase(unittest.TestCase): self.hs.config.macaroon_secret_key = "this key is a massive secret" self.hs.clock.now = 5000 - token = self.hs.handlers.registration_handler.generate_token("a_user") + token = self.hs.handlers.auth_handler.generate_access_token("a_user") macaroon = pymacaroons.Macaroon.deserialize(token) def verify_gen(caveat): |