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

Merge branch 'master' into split-sms-and-retry

Browse Source
This commit is contained in:
Martyn Inglis
2016-06-14 12:55:16 +01:00
parent f143aade71 14e2487266
commit 0a933021d6
11 changed files with 193 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tests/app/celery/test_tasks.py
View File

@@ -245,11 +245,7 @@ def test_should_process_email_job_if_exactly_on_send_limits(notify_db,
(
str(job.service_id),
"uuid",
"\"{}\" <{}@{}>".format(
service.name,
service.email_from,
"test.notify.com"
),
"",
"something_encrypted",
"2016-01-01T11:09:00.061258"
),
@@ -295,11 +291,7 @@ def test_should_process_email_job(sample_email_job, mocker, mock_celery_remove_j
(
str(sample_email_job.service_id),
"uuid",
"\"{}\" <{}@{}>".format(
sample_email_job.service.name,
sample_email_job.service.email_from,
"test.notify.com"
),
"",
"something_encrypted",
"2016-01-01T11:09:00.061258"
),
@@ -865,11 +857,7 @@ def test_process_email_job_should_use_reply_to_email_if_present(sample_email_job
(
str(sample_email_job.service_id),
"uuid",
"\"{}\" <{}@{}>".format(
sample_email_job.service.name,
sample_email_job.service.email_from,
"test.notify.com"
),
"",
"something_encrypted",
ANY
),