Stop using logged_in_client fixture

We have a `client_request` fixture which does a bunch of useful stuff
like:
- checking the status code of the response
- returning a `BeautifulSoup` object

Lots of our tests still use an older fixture called `logged_in_client`.
This is not as good because:
- it returns a raw `Response` object
- doesn’t do the additional checks
- means our tests contain a lot of repetetive boilerplate like `page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')`

This commit converts all the tests using `logged_in_client` to:
use `client_request` instead.
This commit is contained in:
Chris Hill-Scott
2021-12-31 12:08:14 +00:00
parent 50eae6f935
commit 0706664be4
20 changed files with 341 additions and 291 deletions

View File

@@ -652,7 +652,7 @@ def test_view_contact_list_404s_for_non_existing_list(
def test_download_contact_list(
mocker,
logged_in_client,
client_request,
fake_uuid,
mock_get_contact_list,
):
@@ -660,12 +660,12 @@ def test_download_contact_list(
'app.models.contact_list.s3download',
return_value='phone number\n07900900321'
)
response = logged_in_client.get(url_for(
response = client_request.get(
'main.download_contact_list',
service_id=SERVICE_ONE_ID,
contact_list_id=fake_uuid,
))
assert response.status_code == 200
_raw_response=True,
)
assert response.headers['Content-Type'] == (
'text/csv; '
'charset=utf-8'

View File

@@ -492,7 +492,7 @@ def test_uploaded_letter_preview_redirects_if_file_not_in_s3(
))
def test_uploaded_letter_preview_image_shows_overlay_when_content_outside_printable_area_on_a_page(
mocker,
logged_in_client,
client_request,
mock_get_service,
fake_uuid,
invalid_pages,
@@ -515,13 +515,11 @@ def test_uploaded_letter_preview_image_shows_overlay_when_content_outside_printa
return_value=make_response('page.html', 200)
)
logged_in_client.get(
url_for(
'main.view_letter_upload_as_preview',
file_id=fake_uuid,
service_id=SERVICE_ONE_ID,
page=page_requested,
)
client_request.get_response(
'main.view_letter_upload_as_preview',
file_id=fake_uuid,
service_id=SERVICE_ONE_ID,
page=page_requested,
)
if overlay_expected:
@@ -541,7 +539,7 @@ def test_uploaded_letter_preview_image_shows_overlay_when_content_outside_printa
)
def test_uploaded_letter_preview_image_does_not_show_overlay_if_no_content_outside_printable_area(
mocker,
logged_in_client,
client_request,
mock_get_service,
metadata,
fake_uuid,
@@ -554,8 +552,11 @@ def test_uploaded_letter_preview_image_does_not_show_overlay_if_no_content_outsi
'app.main.views.uploads.TemplatePreview.from_valid_pdf_file',
return_value=make_response('page.html', 200))
logged_in_client.get(
url_for('main.view_letter_upload_as_preview', file_id=fake_uuid, service_id=SERVICE_ONE_ID, page=1)
client_request.get_response(
'main.view_letter_upload_as_preview',
file_id=fake_uuid,
service_id=SERVICE_ONE_ID,
page=1,
)
template_preview_mock.assert_called_once_with('pdf_file', 1)