|
8 | 8 |
|
9 | 9 | from rest_registration.api.views.register import RegisterSigner
|
10 | 10 | from rest_registration.settings import registration_settings
|
| 11 | +from tests.utils import shallow_merge_dicts |
11 | 12 |
|
12 | 13 | from .base import APIViewTestCase
|
13 | 14 |
|
|
19 | 20 | 'VERIFICATION_FROM_EMAIL': VERIFICATION_FROM_EMAIL,
|
20 | 21 | }
|
21 | 22 |
|
22 |
| -REST_REGISTRATION_WITH_VERIFICATION_AUTO_LOGIN = { |
23 |
| - 'REGISTER_VERIFICATION_ENABLED': True, |
24 |
| - 'REGISTER_VERIFICATION_URL': REGISTER_VERIFICATION_URL, |
25 |
| - 'VERIFICATION_FROM_EMAIL': VERIFICATION_FROM_EMAIL, |
26 |
| - 'REGISTER_VERIFICATION_AUTO_LOGIN': True, |
27 |
| -} |
28 |
| - |
29 |
| -REST_REGISTRATION_WITH_VERIFICATION_NO_PASSWORD = { |
30 |
| - 'REGISTER_VERIFICATION_ENABLED': True, |
31 |
| - 'REGISTER_VERIFICATION_URL': REGISTER_VERIFICATION_URL, |
32 |
| - 'VERIFICATION_FROM_EMAIL': VERIFICATION_FROM_EMAIL, |
33 |
| - 'REGISTER_SERIALIZER_PASSWORD_CONFIRM': False, |
34 |
| -} |
35 |
| - |
36 | 23 | REST_REGISTRATION_WITHOUT_VERIFICATION = {
|
37 | 24 | 'REGISTER_VERIFICATION_ENABLED': False,
|
38 | 25 | }
|
@@ -63,7 +50,11 @@ def test_register_serializer_ok(self):
|
63 | 50 | )
|
64 | 51 |
|
65 | 52 | @override_settings(
|
66 |
| - REST_REGISTRATION=REST_REGISTRATION_WITH_VERIFICATION_NO_PASSWORD, |
| 53 | + REST_REGISTRATION=shallow_merge_dicts( |
| 54 | + REST_REGISTRATION_WITH_VERIFICATION, { |
| 55 | + 'REGISTER_SERIALIZER_PASSWORD_CONFIRM': False, |
| 56 | + }, |
| 57 | + ), |
67 | 58 | )
|
68 | 59 | def test_register_serializer_no_password_ok(self):
|
69 | 60 | serializer_class = registration_settings.REGISTER_SERIALIZER_CLASS
|
@@ -145,7 +136,11 @@ def test_register_with_html_email_ok(self):
|
145 | 136 | signer.verify()
|
146 | 137 |
|
147 | 138 | @override_settings(
|
148 |
| - REST_REGISTRATION=REST_REGISTRATION_WITH_VERIFICATION_NO_PASSWORD, |
| 139 | + REST_REGISTRATION=shallow_merge_dicts( |
| 140 | + REST_REGISTRATION_WITH_VERIFICATION, { |
| 141 | + 'REGISTER_SERIALIZER_PASSWORD_CONFIRM': False, |
| 142 | + }, |
| 143 | + ), |
149 | 144 | )
|
150 | 145 | def test_register_no_password_confirm_ok(self):
|
151 | 146 | data = self._get_register_user_data(password='testpassword')
|
@@ -291,7 +286,11 @@ def test_verify_ok(self):
|
291 | 286 | self.assertTrue(user.is_active)
|
292 | 287 |
|
293 | 288 | @override_settings(
|
294 |
| - REST_REGISTRATION=REST_REGISTRATION_WITH_VERIFICATION_AUTO_LOGIN, |
| 289 | + REST_REGISTRATION=shallow_merge_dicts( |
| 290 | + REST_REGISTRATION_WITH_VERIFICATION, { |
| 291 | + 'REGISTER_VERIFICATION_AUTO_LOGIN': True, |
| 292 | + }, |
| 293 | + ), |
295 | 294 | )
|
296 | 295 | def test_verify_ok_login(self):
|
297 | 296 | with patch('django.contrib.auth.login') as login_mock:
|
|
0 commit comments