fix raw_set and raw_get

This commit is contained in:
Kenneth Kehl
2024-06-20 11:55:01 -07:00
parent 11e917256a
commit 360d4f2a9a
2 changed files with 14 additions and 14 deletions
@@ -96,8 +96,8 @@ def test_create_invited_user_without_auth_type(
admin_request, sample_service, mocker, invitation_email_template admin_request, sample_service, mocker, invitation_email_template
): ):
mocker.patch("app.service_invite.rest.redis_store.raw_set") mocker.patch("app.service_invite.rest.redis_store.set")
mocker.patch("app.service_invite.rest.redis_store.raw_get") mocker.patch("app.service_invite.rest.redis_store.get")
mocker.patch("app.celery.provider_tasks.deliver_email.apply_async") mocker.patch("app.celery.provider_tasks.deliver_email.apply_async")
email_address = "invited_user@service.gov.uk" email_address = "invited_user@service.gov.uk"
invite_from = sample_service.users[0] invite_from = sample_service.users[0]
@@ -220,8 +220,8 @@ def test_resend_expired_invite(
mocker, mocker,
): ):
mocker.patch("app.service_invite.rest.redis_store.raw_set") mocker.patch("app.service_invite.rest.redis_store.set")
mocker.patch("app.service_invite.rest.redis_store.raw_get") mocker.patch("app.service_invite.rest.redis_store.get")
url = f"/service/{sample_expired_user.service_id}/invite/{sample_expired_user.id}/resend" url = f"/service/{sample_expired_user.service_id}/invite/{sample_expired_user.id}/resend"
mock_send = mocker.patch("app.service_invite.rest.send_notification_to_queue") mock_send = mocker.patch("app.service_invite.rest.send_notification_to_queue")
mock_persist = mocker.patch("app.service_invite.rest.persist_notification") mock_persist = mocker.patch("app.service_invite.rest.persist_notification")
+10 -10
View File
@@ -201,10 +201,10 @@ def test_send_user_sms_code(client, sample_user, sms_code_template, mocker):
""" """
notify_service = dao_fetch_service_by_id(current_app.config["NOTIFY_SERVICE_ID"]) notify_service = dao_fetch_service_by_id(current_app.config["NOTIFY_SERVICE_ID"])
mock_redis_get = mocker.patch("app.user.rest.redis_store.raw_get") mock_redis_get = mocker.patch("app.user.rest.redis_store.get")
mock_redis_get.return_value = "foo" mock_redis_get.return_value = "foo"
mocker.patch("app.user.rest.redis_store.raw_set") mocker.patch("app.user.rest.redis_store.set")
auth_header = create_admin_authorization_header() auth_header = create_admin_authorization_header()
mocked = mocker.patch("app.user.rest.create_secret_code", return_value="11111") mocked = mocker.patch("app.user.rest.create_secret_code", return_value="11111")
mocker.patch("app.celery.provider_tasks.deliver_sms.apply_async") mocker.patch("app.celery.provider_tasks.deliver_sms.apply_async")
@@ -242,10 +242,10 @@ def test_send_user_code_for_sms_with_optional_to_field(
Tests POST endpoint /user/<user_id>/sms-code with optional to field Tests POST endpoint /user/<user_id>/sms-code with optional to field
""" """
mock_redis_get = mocker.patch("app.user.rest.redis_store.raw_get") mock_redis_get = mocker.patch("app.user.rest.redis_store.get")
mock_redis_get.return_value = "foo" mock_redis_get.return_value = "foo"
mocker.patch("app.user.rest.redis_store.raw_set") mocker.patch("app.user.rest.redis_store.set")
to_number = "+14254147755" to_number = "+14254147755"
mocked = mocker.patch("app.user.rest.create_secret_code", return_value="11111") mocked = mocker.patch("app.user.rest.create_secret_code", return_value="11111")
mocker.patch("app.celery.provider_tasks.deliver_sms.apply_async") mocker.patch("app.celery.provider_tasks.deliver_sms.apply_async")
@@ -469,10 +469,10 @@ def test_send_user_email_code(
deliver_email = mocker.patch("app.celery.provider_tasks.deliver_email.apply_async") deliver_email = mocker.patch("app.celery.provider_tasks.deliver_email.apply_async")
sample_user.auth_type = auth_type sample_user.auth_type = auth_type
mock_redis_get = mocker.patch("app.user.rest.redis_store.raw_get") mock_redis_get = mocker.patch("app.user.rest.redis_store.get")
mock_redis_get.return_value = "foo" mock_redis_get.return_value = "foo"
mocker.patch("app.user.rest.redis_store.raw_set") mocker.patch("app.user.rest.redis_store.set")
admin_request.post( admin_request.post(
"user.send_user_2fa_code", "user.send_user_2fa_code",
@@ -497,10 +497,10 @@ def test_send_user_email_code_with_urlencoded_next_param(
): ):
mocker.patch("app.celery.provider_tasks.deliver_email.apply_async") mocker.patch("app.celery.provider_tasks.deliver_email.apply_async")
mock_redis_get = mocker.patch("app.celery.scheduled_tasks.redis_store.raw_get") mock_redis_get = mocker.patch("app.celery.scheduled_tasks.redis_store.get")
mock_redis_get.return_value = "foo" mock_redis_get.return_value = "foo"
mocker.patch("app.celery.scheduled_tasks.redis_store.raw_set") mocker.patch("app.celery.scheduled_tasks.redis_store.set")
data = {"to": None, "next": "/services"} data = {"to": None, "next": "/services"}
admin_request.post( admin_request.post(
@@ -581,10 +581,10 @@ def test_user_verify_email_code_fails_if_code_already_used(
def test_send_user_2fa_code_sends_from_number_for_international_numbers( def test_send_user_2fa_code_sends_from_number_for_international_numbers(
client, sample_user, mocker, sms_code_template client, sample_user, mocker, sms_code_template
): ):
mock_redis_get = mocker.patch("app.user.rest.redis_store.raw_get") mock_redis_get = mocker.patch("app.user.rest.redis_store.get")
mock_redis_get.return_value = "foo" mock_redis_get.return_value = "foo"
mocker.patch("app.user.rest.redis_store.raw_set") mocker.patch("app.user.rest.redis_store.set")
sample_user.mobile_number = "+601117224412" sample_user.mobile_number = "+601117224412"
auth_header = create_admin_authorization_header() auth_header = create_admin_authorization_header()