darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-09-02 17:48:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add robustness to our v2 schema error messages:

Browse Source 
* Ensure we dont raise exception if e.cause does not contain a message
* Ensure we handle case where e.path may be empty
* Refactor existing tests to conform to new format
This commit is contained in:
Imdad Ahad
2016-12-15 16:35:27 +00:00
parent 2c9a3f6f57
commit 7634c2e772
3 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/schema_validation/__init__.py
View File

@@ -42,4 +42,25 @@ def build_error_message(errors):
def __format_message(e): def __format_message(e):
return e.message.replace("'", "") if not e.cause else "{} {}".format(e.path[0], e.cause.message) def get_path(e):
error_path = None
try:
error_path = e.path[0]
finally:
return error_path
def get_error_message(e):
error_message = None
try:
error_message = e.cause.message
except AttributeError:
error_message = e.message
finally:
return error_message.replace("'", '')
path = get_path(e)
message = get_error_message(e)
if path:
return "{} {}".format(path, message)
else:
return "{}".format(message)

1
tests/app/delivery/test_send_to_providers.py
View File

@@ -109,7 +109,6 @@ def test_should_send_personalised_template_to_correct_email_provider_and_persist
assert '<!DOCTYPE html' in app.aws_ses_client.send_email.call_args[1]['html_body'] assert '<!DOCTYPE html' in app.aws_ses_client.send_email.call_args[1]['html_body']
notification = Notification.query.filter_by(id=db_notification.id).one() notification = Notification.query.filter_by(id=db_notification.id).one()
assert notification.status == 'sending' assert notification.status == 'sending'
assert notification.sent_at <= datetime.utcnow() assert notification.sent_at <= datetime.utcnow()
assert notification.sent_by == 'ses' assert notification.sent_by == 'ses'

4
tests/app/v2/notifications/test_get_notifications.py
View File

@@ -218,7 +218,7 @@ def test_get_all_notifications_filter_by_template_type_invalid_template_type(cli
assert json_response['status_code'] == 400 assert json_response['status_code'] == 400
assert len(json_response['errors']) == 1 assert len(json_response['errors']) == 1
assert json_response['errors'][0]['message'] == "orange is not one of [sms, email, letter]" assert json_response['errors'][0]['message'] == "template_type orange is not one of [sms, email, letter]"
def test_get_all_notifications_filter_by_single_status(client, notify_db, notify_db_session): def test_get_all_notifications_filter_by_single_status(client, notify_db, notify_db_session):
@@ -255,7 +255,7 @@ def test_get_all_notifications_filter_by_status_invalid_status(client, sample_no
assert json_response['status_code'] == 400 assert json_response['status_code'] == 400
assert len(json_response['errors']) == 1 assert len(json_response['errors']) == 1
assert json_response['errors'][0]['message'] == "elephant is not one of [created, sending, delivered, " \ assert json_response['errors'][0]['message'] == "status elephant is not one of [created, sending, delivered, " \
"pending, failed, technical-failure, temporary-failure, permanent-failure]" "pending, failed, technical-failure, temporary-failure, permanent-failure]"