Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Return more helpful error messages when a resource conflict occurs

Browse Source
This commit is contained in:
Renzo Lucioni
2014-11-05 22:36:27 -05:00
parent 8a0507c977
commit edba397a20
2 changed files with 41 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
common/djangoapps/user_api/tests/test_views.py
View File

@@ -832,9 +832,6 @@ class RegistrationViewTest(ApiTestCase):
u"required": True,
u"label": u"Email",
u"placeholder": u"username@domain.com",
u"instructions": u"The email address you used to register with {platform_name}".format(
platform_name=settings.PLATFORM_NAME
),
u"restrictions": {
"min_length": account_api.EMAIL_MIN_LENGTH,
"max_length": account_api.EMAIL_MAX_LENGTH
@@ -913,9 +910,6 @@ class RegistrationViewTest(ApiTestCase):
u"required": True,
u"label": u"Email",
u"placeholder": u"username@domain.com",
"instructions": "The email address you used to register with {platform_name}".format(
platform_name=settings.PLATFORM_NAME
),
u"restrictions": {
"min_length": account_api.EMAIL_MIN_LENGTH,
"max_length": account_api.EMAIL_MAX_LENGTH
@@ -1354,7 +1348,10 @@ class RegistrationViewTest(ApiTestCase):
"honor_code": "true",
})
self.assertEqual(response.status_code, 409)
self.assertEqual(response.content, json.dumps(["email"]))
self.assertEqual(
response.content,
"It looks like {} belongs to an existing account.".format(self.EMAIL)
)
def test_register_duplicate_username(self):
# Register the first user
@@ -1376,7 +1373,10 @@ class RegistrationViewTest(ApiTestCase):
"honor_code": "true",
})
self.assertEqual(response.status_code, 409)
self.assertEqual(response.content, json.dumps(["username"]))
self.assertEqual(
response.content,
"It looks like {} belongs to an existing account.".format(self.USERNAME)
)
def test_register_duplicate_username_and_email(self):
# Register the first user
@@ -1398,7 +1398,12 @@ class RegistrationViewTest(ApiTestCase):
"honor_code": "true",
})
self.assertEqual(response.status_code, 409)
self.assertEqual(response.content, json.dumps(["email", "username"]))
self.assertEqual(
response.content,
"It looks like {} and {} belong to an existing account.".format(
self.EMAIL, self.USERNAME
)
)
def _assert_reg_field(self, extra_fields_setting, expected_field):
"""Retrieve the registration form description from the server and