Merge branch 'master' into add-templates-process_type

This commit is contained in:
Rebecca Law
2017-01-13 12:30:31 +00:00
8 changed files with 76 additions and 95 deletions

View File

@@ -445,7 +445,7 @@ def test_should_not_return_html_in_body(notify_api, notify_db, notify_db_session
with notify_api.test_request_context():
with notify_api.test_client() as client:
mocker.patch('app.celery.provider_tasks.deliver_email.apply_async')
email_template = create_sample_email_template(notify_db, notify_db.session, content='hello\nthere')
email_template = create_sample_email_template(notify_db, notify_db_session, content='hello\nthere')
data = {
'to': 'ok@ok.com',