darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-03 18:01:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

address_line_2 is a required field

Browse Source
This commit is contained in:
Leo Hemsted
2017-08-07 14:17:01 +01:00
parent 84a32180b3
commit 5491adcabd
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/schema_validation/definitions.py
View File

@@ -19,7 +19,7 @@ personalisation = {
} }
letter_personalisation = dict(personalisation, required=["address_line_1", "postcode"]) letter_personalisation = dict(personalisation, required=["address_line_1", "address_line_2", "postcode"])
https_url = { https_url = {

24
tests/app/v2/notifications/test_post_letter_notifications.py
View File

@@ -82,7 +82,7 @@ def test_post_letter_notification_returns_400_and_missing_template(
): ):
data = { data = {
'template_id': str(uuid.uuid4()), 'template_id': str(uuid.uuid4()),
'personalisation': {'address_line_1': '', 'postcode': ''} 'personalisation': {'address_line_1': '', 'address_line_2': '', 'postcode': ''}
} }
error_json = letter_request(client, data, service_id=sample_service_full_permissions.id, _expected_status=400) error_json = letter_request(client, data, service_id=sample_service_full_permissions.id, _expected_status=400)
@@ -91,12 +91,12 @@ def test_post_letter_notification_returns_400_and_missing_template(
assert error_json['errors'] == [{'error': 'BadRequestError', 'message': 'Template not found'}] assert error_json['errors'] == [{'error': 'BadRequestError', 'message': 'Template not found'}]
def test_notification_returns_400_for_schema_problems( def test_notification_returns_400_for_missing_template_field(
client, client,
sample_service_full_permissions sample_service_full_permissions
): ):
data = { data = {
'personalisation': {'address_line_1': '', 'postcode': ''} 'personalisation': {'address_line_1': '', 'address_line_2': '', 'postcode': ''}
} }
error_json = letter_request(client, data, service_id=sample_service_full_permissions.id, _expected_status=400) error_json = letter_request(client, data, service_id=sample_service_full_permissions.id, _expected_status=400)
@@ -116,6 +116,7 @@ def test_notification_returns_400_if_address_doesnt_have_underscores(
'template_id': str(sample_letter_template.id), 'template_id': str(sample_letter_template.id),
'personalisation': { 'personalisation': {
'address line 1': 'Her Royal Highness Queen Elizabeth II', 'address line 1': 'Her Royal Highness Queen Elizabeth II',
'address-line-2': 'Buckingham Palace',
'postcode': 'SW1 1AA', 'postcode': 'SW1 1AA',
} }
} }
@@ -123,10 +124,15 @@ def test_notification_returns_400_if_address_doesnt_have_underscores(
error_json = letter_request(client, data, service_id=sample_letter_template.service_id, _expected_status=400) error_json = letter_request(client, data, service_id=sample_letter_template.service_id, _expected_status=400)
assert error_json['status_code'] == 400 assert error_json['status_code'] == 400
assert error_json['errors'] == [{ assert len(error_json['errors']) == 2
assert {
'error': 'ValidationError', 'error': 'ValidationError',
'message': 'personalisation address_line_1 is a required property' 'message': 'personalisation address_line_1 is a required property'
}] } in error_json['errors']
assert {
'error': 'ValidationError',
'message': 'personalisation address_line_2 is a required property'
} in error_json['errors']
def test_returns_a_429_limit_exceeded_if_rate_limit_exceeded( def test_returns_a_429_limit_exceeded_if_rate_limit_exceeded(
@@ -142,7 +148,7 @@ def test_returns_a_429_limit_exceeded_if_rate_limit_exceeded(
data = { data = {
'template_id': str(sample_letter_template.id), 'template_id': str(sample_letter_template.id),
'personalisation': {'address_line_1': '', 'postcode': ''} 'personalisation': {'address_line_1': '', 'address_line_2': '', 'postcode': ''}
} }
error_json = letter_request(client, data, service_id=sample_letter_template.service_id, _expected_status=429) error_json = letter_request(client, data, service_id=sample_letter_template.service_id, _expected_status=429)
@@ -170,7 +176,7 @@ def test_post_letter_notification_returns_403_if_not_allowed_to_send_notificatio
data = { data = {
'template_id': str(template.id), 'template_id': str(template.id),
'personalisation': {'address_line_1': '', 'postcode': ''} 'personalisation': {'address_line_1': '', 'address_line_2': '', 'postcode': ''}
} }
error_json = letter_request(client, data, service_id=service.id, _expected_status=400) error_json = letter_request(client, data, service_id=service.id, _expected_status=400)
@@ -199,7 +205,7 @@ def test_post_letter_notification_doesnt_queue_task(
data = { data = {
'template_id': str(template.id), 'template_id': str(template.id),
'personalisation': {'address_line_1': 'Foo', 'postcode': 'Bar'} 'personalisation': {'address_line_1': 'Foo', 'address_line_2': 'Bar', 'postcode': 'Baz'}
} }
letter_request(client, data, service_id=service.id, key_type=key_type) letter_request(client, data, service_id=service.id, key_type=key_type)
@@ -213,7 +219,7 @@ def test_post_letter_notification_doesnt_queue_task(
def test_post_letter_notification_doesnt_accept_team_key(client, sample_letter_template): def test_post_letter_notification_doesnt_accept_team_key(client, sample_letter_template):
data = { data = {
'template_id': str(sample_letter_template.id), 'template_id': str(sample_letter_template.id),
'personalisation': {'address_line_1': 'Foo', 'postcode': 'Bar'} 'personalisation': {'address_line_1': 'Foo', 'address_line_2': 'Bar', 'postcode': 'Baz'}
} }
error_json = letter_request( error_json = letter_request(