From 360d4f2a9a2160df1971e1406e5f338d10778fe2 Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Thu, 20 Jun 2024 11:55:01 -0700 Subject: [PATCH] fix raw_set and raw_get --- .../test_service_invite_rest.py | 8 ++++---- tests/app/user/test_rest_verify.py | 20 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/tests/app/service_invite/test_service_invite_rest.py b/tests/app/service_invite/test_service_invite_rest.py index 0f60dc3e3..327729776 100644 --- a/tests/app/service_invite/test_service_invite_rest.py +++ b/tests/app/service_invite/test_service_invite_rest.py @@ -96,8 +96,8 @@ def test_create_invited_user_without_auth_type( 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.raw_get") + mocker.patch("app.service_invite.rest.redis_store.set") + mocker.patch("app.service_invite.rest.redis_store.get") mocker.patch("app.celery.provider_tasks.deliver_email.apply_async") email_address = "invited_user@service.gov.uk" invite_from = sample_service.users[0] @@ -220,8 +220,8 @@ def test_resend_expired_invite( mocker, ): - mocker.patch("app.service_invite.rest.redis_store.raw_set") - mocker.patch("app.service_invite.rest.redis_store.raw_get") + mocker.patch("app.service_invite.rest.redis_store.set") + mocker.patch("app.service_invite.rest.redis_store.get") 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_persist = mocker.patch("app.service_invite.rest.persist_notification") diff --git a/tests/app/user/test_rest_verify.py b/tests/app/user/test_rest_verify.py index 81d813039..ff74f6b57 100644 --- a/tests/app/user/test_rest_verify.py +++ b/tests/app/user/test_rest_verify.py @@ -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"]) - 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" - mocker.patch("app.user.rest.redis_store.raw_set") + mocker.patch("app.user.rest.redis_store.set") auth_header = create_admin_authorization_header() mocked = mocker.patch("app.user.rest.create_secret_code", return_value="11111") 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//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" - mocker.patch("app.user.rest.redis_store.raw_set") + mocker.patch("app.user.rest.redis_store.set") to_number = "+14254147755" mocked = mocker.patch("app.user.rest.create_secret_code", return_value="11111") 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") 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" - mocker.patch("app.user.rest.redis_store.raw_set") + mocker.patch("app.user.rest.redis_store.set") admin_request.post( "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") - 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" - mocker.patch("app.celery.scheduled_tasks.redis_store.raw_set") + mocker.patch("app.celery.scheduled_tasks.redis_store.set") data = {"to": None, "next": "/services"} 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( 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" - mocker.patch("app.user.rest.redis_store.raw_set") + mocker.patch("app.user.rest.redis_store.set") sample_user.mobile_number = "+601117224412" auth_header = create_admin_authorization_header()