From c863b33c8dcd216a3f652821343a4a147ef3b885 Mon Sep 17 00:00:00 2001 From: Leo Hemsted Date: Fri, 25 Aug 2017 16:44:05 +0100 Subject: [PATCH] make sure letters are handled properly by the v1 api --- app/schemas.py | 2 +- tests/app/notifications/test_rest.py | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/schemas.py b/app/schemas.py index 50eeffb93..af76eef6e 100644 --- a/app/schemas.py +++ b/app/schemas.py @@ -468,7 +468,7 @@ class NotificationWithPersonalisationSchema(NotificationWithTemplateSchema): in_data['template'] = in_data.pop('template_history') template = get_template_instance(in_data['template'], in_data['personalisation']) in_data['body'] = str(template) - if in_data['template']['template_type'] == models.EMAIL_TYPE: + if in_data['template']['template_type'] != models.SMS_TYPE: in_data['subject'] = template.subject in_data['content_char_count'] = None else: diff --git a/tests/app/notifications/test_rest.py b/tests/app/notifications/test_rest.py index 6a0b53925..9341ecc02 100644 --- a/tests/app/notifications/test_rest.py +++ b/tests/app/notifications/test_rest.py @@ -15,12 +15,20 @@ from tests.app.conftest import sample_notification as create_sample_notification from tests.app.db import create_notification, create_api_key -@pytest.mark.parametrize('type', ('email', 'sms')) -def test_get_notification_by_id(client, sample_notification, sample_email_notification, type): +@pytest.mark.parametrize('type', ('email', 'sms', 'letter')) +def test_get_notification_by_id( + client, + sample_notification, + sample_email_notification, + sample_letter_notification, + type +): if type == 'email': notification_to_get = sample_email_notification if type == 'sms': notification_to_get = sample_notification + if type == 'letter': + notification_to_get = sample_letter_notification auth_header = create_authorization_header(service_id=notification_to_get.service_id) response = client.get(