Let the send_email task set the from address

This commit is contained in:
Rebecca Law
2016-06-13 14:56:21 +01:00
parent c9f1eb65a7
commit 5fc14940f3
4 changed files with 6 additions and 27 deletions

View File

@@ -248,11 +248,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"
),
@@ -298,11 +294,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"
),
@@ -960,11 +952,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
),

View File

@@ -331,7 +331,7 @@ def test_send_user_email_verification(notify_api,
app.celery.tasks.send_email.apply_async.assert_called_once_with(
(str(current_app.config['NOTIFY_SERVICE_ID']),
'some_uuid',
'"GOV.UK Notify" <{}>'.format(current_app.config['VERIFY_CODE_FROM_EMAIL_ADDRESS']),
'',
"something_encrypted",
"2016-01-01T11:09:00.061258"),
queue="email-registration-verification")