merge from main

This commit is contained in:
Kenneth Kehl
2025-01-16 13:22:38 -08:00
19 changed files with 309 additions and 49 deletions

View File

@@ -150,7 +150,9 @@ def test_send_notification_with_placeholders_replaced(
{"template_version": sample_email_template_with_placeholders.version}
)
mocked.assert_called_once_with([notification_id], queue="send-email-tasks")
mocked.assert_called_once_with(
[notification_id], queue="send-email-tasks", countdown=60
)
assert response.status_code == 201
assert response_data["body"] == "Hello Jo\nThis is an email from GOV.UK"
assert response_data["subject"] == "Jo"
@@ -420,7 +422,9 @@ def test_should_allow_valid_sms_notification(notify_api, sample_template, mocker
response_data = json.loads(response.data)["data"]
notification_id = response_data["notification"]["id"]
mocked.assert_called_once_with([notification_id], queue="send-sms-tasks")
mocked.assert_called_once_with(
[notification_id], queue="send-sms-tasks", countdown=60
)
assert response.status_code == 201
assert notification_id
assert "subject" not in response_data
@@ -476,7 +480,7 @@ def test_should_allow_valid_email_notification(
response_data = json.loads(response.get_data(as_text=True))["data"]
notification_id = response_data["notification"]["id"]
app.celery.provider_tasks.deliver_email.apply_async.assert_called_once_with(
[notification_id], queue="send-email-tasks"
[notification_id], queue="send-email-tasks", countdown=60
)
assert response.status_code == 201
@@ -620,7 +624,7 @@ def test_should_send_email_if_team_api_key_and_a_service_user(
)
app.celery.provider_tasks.deliver_email.apply_async.assert_called_once_with(
[fake_uuid], queue="send-email-tasks"
[fake_uuid], queue="send-email-tasks", countdown=60
)
assert response.status_code == 201
@@ -658,7 +662,7 @@ def test_should_send_sms_to_anyone_with_test_key(
],
)
app.celery.provider_tasks.deliver_sms.apply_async.assert_called_once_with(
[fake_uuid], queue="send-sms-tasks"
[fake_uuid], queue="send-sms-tasks", countdown=60
)
assert response.status_code == 201
@@ -697,7 +701,7 @@ def test_should_send_email_to_anyone_with_test_key(
)
app.celery.provider_tasks.deliver_email.apply_async.assert_called_once_with(
[fake_uuid], queue="send-email-tasks"
[fake_uuid], queue="send-email-tasks", countdown=60
)
assert response.status_code == 201
@@ -735,7 +739,7 @@ def test_should_send_sms_if_team_api_key_and_a_service_user(
)
app.celery.provider_tasks.deliver_sms.apply_async.assert_called_once_with(
[fake_uuid], queue="send-sms-tasks"
[fake_uuid], queue="send-sms-tasks", countdown=60
)
assert response.status_code == 201
@@ -792,7 +796,7 @@ def test_should_persist_notification(
],
)
mocked.assert_called_once_with([fake_uuid], queue=queue_name)
mocked.assert_called_once_with([fake_uuid], queue=queue_name, countdown=60)
assert response.status_code == 201
notification = notifications_dao.get_notification_by_id(fake_uuid)
@@ -853,7 +857,7 @@ def test_should_delete_notification_and_return_error_if_redis_fails(
)
assert str(e.value) == "failed to talk to redis"
mocked.assert_called_once_with([fake_uuid], queue=queue_name)
mocked.assert_called_once_with([fake_uuid], queue=queue_name, countdown=60)
assert not notifications_dao.get_notification_by_id(fake_uuid)
assert not db.session.get(NotificationHistory, fake_uuid)
@@ -1185,7 +1189,9 @@ def test_should_allow_store_original_number_on_sms_notification(
response_data = json.loads(response.data)["data"]
notification_id = response_data["notification"]["id"]
mocked.assert_called_once_with([notification_id], queue="send-sms-tasks")
mocked.assert_called_once_with(
[notification_id], queue="send-sms-tasks", countdown=60
)
assert response.status_code == 201
assert notification_id
notifications = db.session.execute(select(Notification)).scalars().all()