Skip to content

Commit 31d8960

Browse files
committed
Refactor: using shallow_merge_dicts in register view tests
1 parent 1516ac9 commit 31d8960

File tree

1 file changed

+16
-17
lines changed

1 file changed

+16
-17
lines changed

tests/api/test_register.py

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
from rest_registration.api.views.register import RegisterSigner
1010
from rest_registration.settings import registration_settings
11+
from tests.utils import shallow_merge_dicts
1112

1213
from .base import APIViewTestCase
1314

@@ -19,20 +20,6 @@
1920
'VERIFICATION_FROM_EMAIL': VERIFICATION_FROM_EMAIL,
2021
}
2122

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-
3623
REST_REGISTRATION_WITHOUT_VERIFICATION = {
3724
'REGISTER_VERIFICATION_ENABLED': False,
3825
}
@@ -63,7 +50,11 @@ def test_register_serializer_ok(self):
6350
)
6451

6552
@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+
),
6758
)
6859
def test_register_serializer_no_password_ok(self):
6960
serializer_class = registration_settings.REGISTER_SERIALIZER_CLASS
@@ -145,7 +136,11 @@ def test_register_with_html_email_ok(self):
145136
signer.verify()
146137

147138
@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+
),
149144
)
150145
def test_register_no_password_confirm_ok(self):
151146
data = self._get_register_user_data(password='testpassword')
@@ -291,7 +286,11 @@ def test_verify_ok(self):
291286
self.assertTrue(user.is_active)
292287

293288
@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+
),
295294
)
296295
def test_verify_ok_login(self):
297296
with patch('django.contrib.auth.login') as login_mock:

0 commit comments

Comments
 (0)