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

Merge pull request #459 from alphagov/replaced-subjects

Browse Source 
Replaced subjects
This commit is contained in:
Leo Hemsted
2016-06-22 17:06:18 +01:00
committed by GitHub
parent 4ce26dc1a4 c92138d5ab
commit edd920769c
4 changed files with 43 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -90,39 +90,40 @@ def test_send_notification_invalid_template_id(notify_api, sample_template, mock
@freeze_time("2016-01-01 11:09:00.061258")
def test_send_notification_with_placeholders_replaced(notify_api, sample_template_with_placeholders, mocker):
def test_send_notification_with_placeholders_replaced(notify_api, sample_email_template_with_placeholders, mocker):
with notify_api.test_request_context():
with notify_api.test_client() as client:
mocker.patch('app.celery.tasks.send_sms.apply_async')
mocker.patch('app.celery.tasks.send_email.apply_async')
data = {
'to': '+447700900855',
'template': str(sample_template_with_placeholders.id),
'to': 'ok@ok.com',
'template': str(sample_email_template_with_placeholders.id),
'personalisation': {
'name': 'Jo'
}
}
auth_header = create_authorization_header(service_id=sample_template_with_placeholders.service.id)
auth_header = create_authorization_header(service_id=sample_email_template_with_placeholders.service.id)
response = client.post(
path='/notifications/sms',
path='/notifications/email',
data=json.dumps(data),
headers=[('Content-Type', 'application/json'), auth_header])
response_data = json.loads(response.data)['data']
notification_id = response_data['notification']['id']
data.update({"template_version": sample_template_with_placeholders.version})
data.update({"template_version": sample_email_template_with_placeholders.version})
app.celery.tasks.send_sms.apply_async.assert_called_once_with(
(str(sample_template_with_placeholders.service.id),
app.celery.tasks.send_email.apply_async.assert_called_once_with(
(str(sample_email_template_with_placeholders.service.id),
notification_id,
ANY,
"2016-01-01T11:09:00.061258"),
queue="sms"
queue="email"
)
assert response.status_code == 201
assert encryption.decrypt(app.celery.tasks.send_sms.apply_async.call_args[0][0][2]) == data
assert encryption.decrypt(app.celery.tasks.send_email.apply_async.call_args[0][0][2]) == data
assert response_data['body'] == 'Hello Jo'
assert response_data['subject'] == 'Jo'
def test_should_not_send_notification_for_archived_template(notify_api, sample_template):

24
tests/app/notifications/test_rest.py
View File

@@ -1248,6 +1248,30 @@ def test_get_notification_by_id_returns_merged_template_content(notify_db,
notification = json.loads(response.get_data(as_text=True))['data']['notification']
assert response.status_code == 200
assert notification['body'] == 'Hello world'
assert 'subject' not in notification
def test_get_notification_by_id_returns_merged_template_content_for_email(
notify_db,
notify_db_session,
notify_api,
sample_email_template_with_placeholders
):
sample_notification = create_sample_notification(notify_db,
notify_db_session,
template=sample_email_template_with_placeholders,
personalisation={"name": "world"})
with notify_api.test_request_context(), notify_api.test_client() as client:
auth_header = create_authorization_header(service_id=sample_notification.service_id)
response = client.get(
'/notifications/{}'.format(sample_notification.id),
headers=[auth_header])
notification = json.loads(response.get_data(as_text=True))['data']['notification']
assert response.status_code == 200
assert notification['body'] == 'Hello world'
assert notification['subject'] == 'world'
def test_get_notifications_for_service_returns_merged_template_content(notify_api,