diff options
| author | David Baker <dbkr@users.noreply.github.com> | 2016-07-19 16:13:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-19 16:13:45 +0100 |
| commit | b9e997f5614bf8ad65f75cb3f75fd3ccd6837664 (patch) | |
| tree | e2cbcc6fe9b733aadfe68e5ea37088ad2ff6d63c /tests/rest | |
| parent | Merge pull request #929 from matrix-org/rav/support_deviceid_in_login (diff) | |
| parent | Don't bind email unless threepid contains expected fields (diff) | |
| download | synapse-b9e997f5614bf8ad65f75cb3f75fd3ccd6837664.tar.xz | |
Merge pull request #931 from matrix-org/rav/refactor_register
rest/client/v2_alpha/register.py: Refactor flow somewhat.
Diffstat (limited to 'tests/rest')
| -rw-r--r-- | tests/rest/client/v2_alpha/test_register.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/rest/client/v2_alpha/test_register.py b/tests/rest/client/v2_alpha/test_register.py index cda0a2b27c..9a4215fef7 100644 --- a/tests/rest/client/v2_alpha/test_register.py +++ b/tests/rest/client/v2_alpha/test_register.py @@ -114,7 +114,8 @@ class RegisterRestServletTestCase(unittest.TestCase): "username": "kermit", "password": "monkey" }, None) - self.registration_handler.register = Mock(return_value=(user_id, token)) + self.registration_handler.register = Mock(return_value=(user_id, None)) + self.auth_handler.issue_access_token = Mock(return_value=token) (code, result) = yield self.servlet.on_POST(self.request) self.assertEquals(code, 200) |