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

Merge branch 'master' into email-registered-users

Browse Source
This commit is contained in:
Rebecca Law
2016-07-08 14:53:38 +01:00
parent f4976539e4 6c4f098852
commit b2da3f563b
9 changed files with 100 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/app/conftest.py
View File

@@ -154,7 +154,7 @@ def sample_template(notify_db,
notify_db_session,
template_name="Template Name",
template_type="sms",
content="This is a template",
content="This is a template:\nwith a newline",
archived=False,
subject_line='Subject',
user=None,
@@ -185,7 +185,7 @@ 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))")
return sample_template(notify_db, notify_db_session, content="Hello ((name))\nYour thing is due soon")
@pytest.fixture(scope='function')
@@ -223,7 +223,7 @@ def sample_email_template_with_placeholders(notify_db, notify_db_session):
return sample_email_template(
notify_db,
notify_db_session,
content="Hello ((name))",
content="Hello ((name))\nThis is an email from GOV.UK",
subject_line="((name))")