From ecbe87a0d60beb01e1fc87fe4e048223a15301f2 Mon Sep 17 00:00:00 2001 From: Ken Tsang Date: Wed, 22 Mar 2017 14:22:26 +0000 Subject: [PATCH] Added letter preview --- app/utils.py | 6 +++--- tests/app/v2/template/test_post_template.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/utils.py b/app/utils.py index 15d38e42d..a939f849d 100644 --- a/app/utils.py +++ b/app/utils.py @@ -3,7 +3,7 @@ from datetime import datetime, timedelta import pytz from flask import url_for from sqlalchemy import func -from notifications_utils.template import SMSMessageTemplate, PlainTextEmailTemplate +from notifications_utils.template import SMSMessageTemplate, PlainTextEmailTemplate, LetterPreviewTemplate def pagination_links(pagination, endpoint, **kwargs): @@ -26,9 +26,9 @@ def url_with_token(data, url, config): def get_template_instance(template, values): - from app.models import SMS_TYPE, EMAIL_TYPE + from app.models import SMS_TYPE, EMAIL_TYPE, LETTER_TYPE return { - SMS_TYPE: SMSMessageTemplate, EMAIL_TYPE: PlainTextEmailTemplate + SMS_TYPE: SMSMessageTemplate, EMAIL_TYPE: PlainTextEmailTemplate, LETTER_TYPE: LetterPreviewTemplate }[template['template_type']](template, values) diff --git a/tests/app/v2/template/test_post_template.py b/tests/app/v2/template/test_post_template.py index c8c8374ae..e0b84f468 100644 --- a/tests/app/v2/template/test_post_template.py +++ b/tests/app/v2/template/test_post_template.py @@ -3,7 +3,7 @@ import uuid from flask import json -from app.models import EMAIL_TYPE, SMS_TYPE, LETTER_TYPE +from app.models import TEMPLATE_TYPES from tests import create_authorization_header from tests.app.db import create_template @@ -12,7 +12,7 @@ valid_data = { } -@pytest.mark.parametrize("tmp_type", [EMAIL_TYPE, SMS_TYPE]) +@pytest.mark.parametrize("tmp_type", TEMPLATE_TYPES) def test_valid_post_template_returns_200(client, sample_service, tmp_type): template = create_template( sample_service, @@ -35,7 +35,7 @@ def test_valid_post_template_returns_200(client, sample_service, tmp_type): assert 'Dear {}'.format(valid_data['personalisation']['Name']) in resp_json['content']['body'] -@pytest.mark.parametrize("tmp_type", [EMAIL_TYPE, SMS_TYPE]) +@pytest.mark.parametrize("tmp_type", TEMPLATE_TYPES) def test_invalid_post_template_returns_400(client, sample_service, tmp_type): template = create_template( sample_service,