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

Merge pull request #1246 from alphagov/ken-prevent-blank-letter-address

Browse Source 
Raise validation errors for empty letter fields
This commit is contained in:
kentsanggds
2017-09-12 14:36:54 +01:00
committed by GitHub
parent d88e437005 41f427d6dd
commit ca1856eb20
2 changed files with 53 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/schema_validation/definitions.py
View File

@@ -19,7 +19,27 @@ personalisation = {
}
letter_personalisation = dict(personalisation, required=["address_line_1", "address_line_2", "postcode"])
letter_personalisation = dict(
personalisation,
properties={
"address_line_1": {
"type": "string",
"minLength": 1,
"validationMessage": "address_line_1 is required"
},
"address_line_2": {
"type": "string",
"minLength": 1,
"validationMessage": "address_line_2 is required"
},
"postcode": {
"type": "string",
"minLength": 1,
"validationMessage": "postcode is required"
},
},
required=["address_line_1", "address_line_2", "postcode"],
)
https_url = {

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

@@ -22,6 +22,13 @@ from tests import create_authorization_header
from tests.app.db import create_service, create_template
test_address = {
'address_line_1': 'test 1',
'address_line_2': 'test 2',
'postcode': 'test pc'
}
def letter_request(client, data, service_id, key_type=KEY_TYPE_NORMAL, _expected_status=201):
resp = client.post(
url_for('v2_notifications.post_notification', notification_type=LETTER_TYPE),
@@ -84,7 +91,7 @@ def test_post_letter_notification_returns_400_and_missing_template(
):
data = {
'template_id': str(uuid.uuid4()),
'personalisation': {'address_line_1': '', 'address_line_2': '', 'postcode': ''}
'personalisation': test_address
}
error_json = letter_request(client, data, service_id=sample_service_full_permissions.id, _expected_status=400)
@@ -93,12 +100,33 @@ def test_post_letter_notification_returns_400_and_missing_template(
assert error_json['errors'] == [{'error': 'BadRequestError', 'message': 'Template not found'}]
def test_post_letter_notification_returns_400_for_empty_personalisation(
client,
sample_service_full_permissions,
sample_letter_template
):
data = {
'template_id': str(sample_letter_template.id),
'personalisation': {'address_line_1': '', 'address_line_2': '', 'postcode': ''}
}
error_json = letter_request(client, data, service_id=sample_service_full_permissions.id, _expected_status=400)
assert error_json['status_code'] == 400
assert all([e['error'] == 'ValidationError' for e in error_json['errors']])
assert set([e['message'] for e in error_json['errors']]) == set([
'personalisation address_line_1 is required',
'personalisation address_line_2 is required',
'personalisation postcode is required'
])
def test_notification_returns_400_for_missing_template_field(
client,
sample_service_full_permissions
):
data = {
'personalisation': {'address_line_1': '', 'address_line_2': '', 'postcode': ''}
'personalisation': test_address
}
error_json = letter_request(client, data, service_id=sample_service_full_permissions.id, _expected_status=400)
@@ -150,7 +178,7 @@ def test_returns_a_429_limit_exceeded_if_rate_limit_exceeded(
data = {
'template_id': str(sample_letter_template.id),
'personalisation': {'address_line_1': '', 'address_line_2': '', 'postcode': ''}
'personalisation': test_address
}
error_json = letter_request(client, data, service_id=sample_letter_template.service_id, _expected_status=429)
@@ -178,7 +206,7 @@ def test_post_letter_notification_returns_403_if_not_allowed_to_send_notificatio
data = {
'template_id': str(template.id),
'personalisation': {'address_line_1': '', 'address_line_2': '', 'postcode': ''}
'personalisation': test_address
}
error_json = letter_request(client, data, service_id=service.id, _expected_status=400)