darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-04 10:21:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #265 from alphagov/fix-duplicate-service-name-test

Browse Source 
Fix test for duplicate service name
This commit is contained in:
Chris Hill-Scott
2016-04-26 15:53:16 +01:00
parent b282f5015b f6d3ce0b6a
commit 071ce4cac4
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/errors.py
View File

@@ -64,6 +64,8 @@ def register_errors(blueprint):
'duplicate key value violates unique constraint "services_email_from_key"' in e.orig.pgerror):
return jsonify(
result='error',
message={'name': ["Duplicate service name '{}'".format(e.params.get('name', ''))]}
message={'name': ["Duplicate service name '{}'".format(
e.params.get('name', e.params.get('email_from', ''))
)]}
), 400
return jsonify(result='error', message="Internal server error"), 500

5
tests/app/service/test_rest.py
View File

@@ -494,7 +494,10 @@ def test_should_not_update_service_with_duplicate_email_from(notify_api,
assert resp.status_code == 400
json_resp = json.loads(resp.get_data(as_text=True))
assert json_resp['result'] == 'error'
assert "Duplicate service name '{}'".format(service_name) in json_resp['message']['name']
assert (
"Duplicate service name '{}'".format(service_name) in json_resp['message']['name'] or
"Duplicate service name '{}'".format(email_from) in json_resp['message']['name']
)
def test_update_service_should_404_if_id_is_invalid(notify_api, notify_db, notify_db_session):