Set postage on basis of postage argument or template postage

This commit is contained in:
Pea Tyczynska
2019-02-05 12:48:40 +00:00
parent f6d3e87de5
commit 5b9e6c2086
9 changed files with 63 additions and 69 deletions

View File

@@ -18,8 +18,7 @@ from app.models import (
LETTER_TYPE,
SMS_TYPE,
Template,
TemplateHistory,
CHOOSE_POSTAGE
TemplateHistory
)
from app.dao.templates_dao import dao_get_template_by_id, dao_redact_template
@@ -44,7 +43,7 @@ from tests.conftest import set_config_values
def test_should_create_a_new_template_for_a_service(
client, sample_user, template_type, subject
):
service = create_service(service_permissions=[template_type, CHOOSE_POSTAGE])
service = create_service(service_permissions=[template_type])
data = {
'name': 'my template',
'template_type': template_type,
@@ -339,7 +338,7 @@ def test_must_have_a_subject_on_an_email_or_letter_template(client, sample_user,
def test_update_should_update_a_template(client, sample_user):
service = create_service(service_permissions=[LETTER_TYPE, CHOOSE_POSTAGE])
service = create_service(service_permissions=[LETTER_TYPE])
template = create_template(service, template_type="letter", postage="second")
data = {
'content': 'my template has new content, swell!',