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

Merge pull request #722 from alphagov/whitepace-in-personalisation

Browse Source 
Ignore case and whitespace in personalisation keys
This commit is contained in:
Chris Hill-Scott
2016-11-11 11:33:37 +01:00
committed by GitHub
parent abecb5ff98 988bf06132
commit d51c63cb6b
6 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/app/conftest.py
View File

@@ -190,7 +190,8 @@ def sample_template(notify_db,
@pytest.fixture(scope='function')
def sample_template_with_placeholders(notify_db, notify_db_session):
return sample_template(notify_db, notify_db_session, content="Hello ((name))\nYour thing is due soon")
# deliberate space and title case in placeholder
return sample_template(notify_db, notify_db_session, content="Hello (( Name))\nYour thing is due soon")
@pytest.fixture(scope='function')

2
tests/app/invite/test_invite_rest.py
View File

@@ -85,7 +85,7 @@ def test_create_invited_user_invalid_email(notify_api, sample_service, mocker):
assert response.status_code == 400
json_resp = json.loads(response.get_data(as_text=True))
assert json_resp['result'] == 'error'
assert json_resp['message'] == {'email_address': ['Not a valid email address']}
assert json_resp['message'] == {'email_address': ['Not a valid email address.']}
app.celery.tasks.send_email.apply_async.assert_not_called()

4
tests/app/notifications/rest/test_send_notification.py
View File

@@ -306,7 +306,7 @@ def test_should_reject_email_notification_with_bad_email(notify_api, sample_emai
mocked.apply_async.assert_not_called()
assert response.status_code == 400
assert data['result'] == 'error'
assert data['message']['to'][0] == 'Not a valid email address'
assert data['message']['to'][0] == 'Not a valid email address.'
@freeze_time("2016-01-01 11:09:00.061258")
@@ -914,7 +914,7 @@ def test_create_template_raises_invalid_request_exception_with_missing_personali
from app.notifications.rest import create_template_object_for_notification
with pytest.raises(InvalidRequest) as e:
create_template_object_for_notification(template, {})
assert {'template': ['Missing personalisation: name']} == e.value.message
assert {'template': ['Missing personalisation: Name']} == e.value.message
def test_create_template_raises_invalid_request_exception_with_too_much_personalisation_data(

2
tests/app/user/test_rest.py
View File

@@ -470,7 +470,7 @@ def test_send_user_reset_password_should_return_400_when_data_is_not_email_addre
headers=[('Content-Type', 'application/json'), auth_header])
assert resp.status_code == 400
assert json.loads(resp.get_data(as_text=True))['message'] == {'email': ['Not a valid email address']}
assert json.loads(resp.get_data(as_text=True))['message'] == {'email': ['Not a valid email address.']}
@freeze_time("2016-01-01 11:09:00.061258")