darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-01-30 06:21:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

make integrity check more restrictive

Browse Source 
previously, it was too loose - checking `"name" in str(exc)` returns
false positives.

By changing from three if statements to a loop we can cut down on
unnecessary code (and ensure that the returned objects are consistent),
and by using the full check constraint name we can be sure that we're
only capturing exactly the right errors. Additionally, don't return
the original data in the error message - it's obvious what the name is
because it'll be populated in the form you just filled in.
This commit is contained in:
Leo Hemsted
2019-01-28 17:01:13 +00:00
parent 4dbb54b5e7
commit 1cd498dd39
2 changed files with 13 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/app/letter_branding/test_letter_branding_rest.py
View File

@@ -61,11 +61,11 @@ def test_create_letter_branding(client, notify_db_session):
assert letter_brand.filename == form['filename']
def test_create_letter_branding_returns_400_if_name_already_exists(client, notify_db_session):
def test_create_letter_branding_returns_400_if_domain_already_exists(client, notify_db_session):
create_letter_branding(name='duplicate', domain='duplicate', filename='duplicate')
form = {
'name': 'duplicate',
'domain': 'super.brand',
'name': 'super brand',
'domain': 'duplicate',
'filename': 'super-brand',
}
@@ -77,7 +77,7 @@ def test_create_letter_branding_returns_400_if_name_already_exists(client, notif
assert response.status_code == 400
json_resp = json.loads(response.get_data(as_text=True))
assert json_resp['message'] == {'name': ["Duplicate domain 'super.brand'"]}
assert json_resp['message'] == {'domain': ["Domain already in use"]}
def test_update_letter_branding_returns_400_when_integrity_error_is_thrown(
@@ -86,8 +86,8 @@ def test_update_letter_branding_returns_400_when_integrity_error_is_thrown(
create_letter_branding(name='duplicate', domain='duplicate', filename='duplicate')
brand_to_update = create_letter_branding(name='super brand', domain='super brand', filename='super brand')
form = {
'name': 'super brand',
'domain': 'duplicate',
'name': 'duplicate',
'domain': 'super brand',
'filename': 'super-brand',
}
@@ -99,4 +99,4 @@ def test_update_letter_branding_returns_400_when_integrity_error_is_thrown(
assert response.status_code == 400
json_resp = json.loads(response.get_data(as_text=True))
assert json_resp['message'] == {"name": ["Duplicate domain 'duplicate'"]}
assert json_resp['message'] == {"name": ["Name already in use"]}