darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-09 16:39:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Replace uses of client to set request context

Browse Source 
Some tests use the `client` fixture but don’t call any of its methods.
The reason for doing this is because the test depends on something in
the request context.

This commit replaces all those instances with `client_request`, which
also sets the request context.

These tests are the last ones that still use the `client` fixture. By
replacing it with `client_request` we will be able to say that no tests
should be using the `client` fixture directly.
This commit is contained in:
Chris Hill-Scott
2022-01-04 18:33:23 +00:00
parent 7e707db4b2
commit 6540701aa7
19 changed files with 87 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/app/s3_client/test_s3_csv_client.py
View File

@@ -3,7 +3,7 @@ from unittest.mock import Mock
from app.s3_client.s3_csv_client import set_metadata_on_csv_upload
def test_sets_metadata(client, mocker):
def test_sets_metadata(client_request, mocker):
mocked_s3_object = Mock()
mocked_get_s3_object = mocker.patch(
'app.s3_client.s3_csv_client.get_csv_upload',

12
tests/app/s3_client/test_s3_logo_client.py
View File

@@ -42,7 +42,7 @@ def letter_upload_filename(fake_uuid):
)
def test_upload_email_logo_calls_correct_args(client, mocker, fake_uuid, upload_filename):
def test_upload_email_logo_calls_correct_args(client_request, mocker, fake_uuid, upload_filename):
mocker.patch('uuid.uuid4', return_value=upload_id)
mocker.patch.dict('flask.current_app.config', {'LOGO_UPLOAD_BUCKET_NAME': bucket})
mocked_s3_upload = mocker.patch('app.s3_client.s3_logo_client.utils_s3upload')
@@ -75,7 +75,7 @@ def test_upload_letter_temp_logo_calls_correct_args(mocker, fake_uuid, letter_up
assert new_filename == 'letters/static/images/letter-template/temp-{}_test_uuid-test.svg'.format(fake_uuid)
def test_persist_logo(client, mocker, fake_uuid, upload_filename):
def test_persist_logo(client_request, mocker, fake_uuid, upload_filename):
mocker.patch.dict('flask.current_app.config', {'LOGO_UPLOAD_BUCKET_NAME': bucket})
mocked_get_s3_object = mocker.patch('app.s3_client.s3_logo_client.get_s3_object')
mocked_delete_s3_object = mocker.patch('app.s3_client.s3_logo_client.delete_s3_object')
@@ -88,7 +88,7 @@ def test_persist_logo(client, mocker, fake_uuid, upload_filename):
mocked_delete_s3_object.assert_called_once_with(upload_filename)
def test_persist_logo_returns_if_not_temp(client, mocker, fake_uuid):
def test_persist_logo_returns_if_not_temp(client_request, mocker, fake_uuid):
filename = 'logo.png'
persist_logo(filename, filename)
@@ -122,7 +122,7 @@ def test_letter_filename_for_db_when_file_does_not_have_a_temp_tag(fake_uuid):
assert letter_filename_for_db(filename, fake_uuid) == '{}-test'.format(fake_uuid)
def test_delete_email_temp_files_created_by_user(client, mocker, fake_uuid):
def test_delete_email_temp_files_created_by_user(client_request, mocker, fake_uuid):
obj = namedtuple("obj", ["key"])
objs = [obj(key='test1'), obj(key='test2')]
@@ -148,7 +148,7 @@ def test_delete_letter_temp_files_created_by_user(mocker, fake_uuid):
assert arg == call(objs[index].key)
def test_delete_single_email_temp_file(client, mocker, upload_filename):
def test_delete_single_email_temp_file(client_request, mocker, upload_filename):
mocked_delete_s3_object = mocker.patch('app.s3_client.s3_logo_client.delete_s3_object')
delete_email_temp_file(upload_filename)
@@ -156,7 +156,7 @@ def test_delete_single_email_temp_file(client, mocker, upload_filename):
mocked_delete_s3_object.assert_called_with(upload_filename)
def test_does_not_delete_non_temp_email_file(client, mocker):
def test_does_not_delete_non_temp_email_file(client_request, mocker):
filename = 'logo.png'
mocked_delete_s3_object = mocker.patch('app.s3_client.s3_logo_client.delete_s3_object')