diff --git a/tests/app/main/views/organisations/test_organisations.py b/tests/app/main/views/organisations/test_organisations.py index 77cc3efff..63c80c84f 100644 --- a/tests/app/main/views/organisations/test_organisations.py +++ b/tests/app/main/views/organisations/test_organisations.py @@ -1724,11 +1724,10 @@ def test_download_organisation_agreement( ) client_request.login(platform_admin_user) - response = client_request.get( + response = client_request.get_response( 'main.organisation_download_agreement', org_id=ORGANISATION_ID, _expected_status=expected_status, - _raw_response=True ) if expected_file_served: diff --git a/tests/app/main/views/test_agreement.py b/tests/app/main/views/test_agreement.py index dfbbbd539..c3b2dd0ec 100644 --- a/tests/app/main/views/test_agreement.py +++ b/tests/app/main/views/test_agreement.py @@ -160,12 +160,11 @@ def test_download_service_agreement( return_value=MockS3Object(b'foo') ) - response = client_request.get(url_for( + response = client_request.get_response( 'main.service_download_agreement', service_id=SERVICE_ONE_ID, _expected_status=expected_status, - _raw_respons=True, - )) + ) if expected_file_served: assert response.get_data() == b'foo' diff --git a/tests/app/main/views/test_dashboard.py b/tests/app/main/views/test_dashboard.py index 8031482ca..685498990 100644 --- a/tests/app/main/views/test_dashboard.py +++ b/tests/app/main/views/test_dashboard.py @@ -475,10 +475,9 @@ def test_download_inbox_strips_formulae( }] }, ) - response = client_request.get( + response = client_request.get_response( 'main.inbox_download', service_id=SERVICE_ONE_ID, - _raw_response=True, ) assert expected_cell in response.get_data(as_text=True).split('\r\n')[1] diff --git a/tests/app/main/views/test_jobs.py b/tests/app/main/views/test_jobs.py index 1712b7cc7..4cdbe3e86 100644 --- a/tests/app/main/views/test_jobs.py +++ b/tests/app/main/views/test_jobs.py @@ -693,11 +693,10 @@ def test_should_show_updates_for_one_job_as_json( mocker, fake_uuid, ): - response = client_request.get( + response = client_request.get_response( 'main.view_job_updates', service_id=service_one['id'], job_id=fake_uuid, - _raw_response=True, ) content = json.loads(response.get_data(as_text=True)) @@ -731,11 +730,10 @@ def test_should_show_updates_for_scheduled_job_as_json( processing_started='2016-06-01T15:00:00+00:00', )}) - response = client_request.get( + response = client_request.get_response( 'main.view_job_updates', service_id=service_one['id'], job_id=fake_uuid, - _raw_response=True, ) content = response.json diff --git a/tests/app/main/views/test_notifications.py b/tests/app/main/views/test_notifications.py index 7086828ec..6e7725bef 100644 --- a/tests/app/main/views/test_notifications.py +++ b/tests/app/main/views/test_notifications.py @@ -690,12 +690,11 @@ def test_should_show_preview_error_image_letter_notification_on_preview_error( mocker.patch("builtins.open", mock_open(read_data=b"preview error image")) - response = client_request.get( + response = client_request.get_response( 'main.view_letter_notification_as_preview', service_id=SERVICE_ONE_ID, notification_id=fake_uuid, filetype='png', - _raw_response=True, ) assert response.get_data(as_text=True) == 'preview error image' @@ -893,12 +892,11 @@ def test_should_show_image_of_precompiled_letter_notification( } ) - response = client_request.get( + response = client_request.get_response( 'main.view_letter_notification_as_preview', service_id=SERVICE_ONE_ID, notification_id=fake_uuid, filetype="png", - _raw_response=True, ) assert response.get_data(as_text=True) == 'foo' diff --git a/tests/app/main/views/test_platform_admin.py b/tests/app/main/views/test_platform_admin.py index 6f9254ad3..c44d53d9d 100644 --- a/tests/app/main/views/test_platform_admin.py +++ b/tests/app/main/views/test_platform_admin.py @@ -846,9 +846,8 @@ def test_get_live_services_report( ]} ) client_request.login(platform_admin_user) - response = client_request.get( + response = client_request.get_response( 'main.live_services_csv', - _raw_response=True, ) report = response.get_data(as_text=True) assert report.strip() == ( @@ -943,11 +942,10 @@ def test_get_billing_report_when_calls_api_and_download_data( ) client_request.login(platform_admin_user) - response = client_request.post( + response = client_request.post_response( 'main.get_billing_report', _data={'start_date': '2019-01-01', 'end_date': '2019-03-31'}, _expected_status=200, - _raw_response=True, ) assert response.content_type == 'text/csv; charset=utf-8' @@ -996,11 +994,10 @@ def test_get_notifications_sent_by_service_calls_api_and_downloads_data( end_date = datetime.date(2019, 1, 31) client_request.login(platform_admin_user) - response = client_request.post( + response = client_request.post_response( 'main.notifications_sent_by_service', _data={'start_date': start_date, 'end_date': end_date}, _expected_status=200, - _raw_response=True, ) assert response.content_type == 'text/csv; charset=utf-8' diff --git a/tests/app/main/views/test_send.py b/tests/app/main/views/test_send.py index 62f5e7956..be502566c 100644 --- a/tests/app/main/views/test_send.py +++ b/tests/app/main/views/test_send.py @@ -2192,12 +2192,11 @@ def test_send_test_works_as_letter_preview( with client_request.session_transaction() as session: session['placeholders'] = {'address_line_1': 'Jo Lastname'} client_request.login(platform_admin_user) - response = client_request.get( + response = client_request.get_response( 'no_cookie.send_test_preview', service_id=service_id, template_id=template_id, filetype=filetype, - _raw_response=True, ) mock_get_service_letter_template.assert_called_with(service_id, template_id, None) @@ -2463,10 +2462,11 @@ def test_download_example_csv( mock_has_permissions, fake_uuid ): - response = client_request.get( - url_for('main.get_example_csv', service_id=fake_uuid, template_id=fake_uuid), + response = client_request.get_response( + 'main.get_example_csv', + service_id=fake_uuid, + template_id=fake_uuid, follow_redirects=True, - _raw_response=True, ) assert response.get_data(as_text=True) == ( 'phone number,name,date\r\n' @@ -2766,13 +2766,12 @@ def test_can_start_letters_job( } client_request.login(platform_admin_user) - response = client_request.post( + response = client_request.post_response( 'main.start_job', service_id=service_one['id'], upload_id=fake_uuid, _data={}, _expected_status=302, - _raw_response=True, ) assert 'just_sent=yes' in response.location @@ -2865,13 +2864,12 @@ def test_should_show_preview_letter_message( } client_request.login(platform_admin_user) - response = client_request.get( + response = client_request.get_response( 'no_cookie.check_messages_preview', service_id=service_id, template_id=fake_uuid, upload_id=fake_uuid, filetype=filetype, - _raw_response=True, **extra_args ) diff --git a/tests/app/main/views/test_templates.py b/tests/app/main/views/test_templates.py index 898f77d56..c6d75ada1 100644 --- a/tests/app/main/views/test_templates.py +++ b/tests/app/main/views/test_templates.py @@ -1174,10 +1174,9 @@ def test_letter_branding_preview_image( return_value='foo' ) client_request.login(platform_admin_user) - resp = client_request.get( + resp = client_request.get_response( 'no_cookie.letter_branding_preview_image', filename=original_filename, - _raw_response=True, ) mocked_preview.assert_called_with( diff --git a/tests/app/main/views/test_webauthn_credentials.py b/tests/app/main/views/test_webauthn_credentials.py index 3af565397..82e11961e 100644 --- a/tests/app/main/views/test_webauthn_credentials.py +++ b/tests/app/main/views/test_webauthn_credentials.py @@ -52,9 +52,8 @@ def test_begin_register_returns_encoded_options( mocker.patch('app.models.webauthn_credential.WebAuthnCredentials.client_method', return_value=[]) client_request.login(platform_admin_user) - response = client_request.get( + response = client_request.get_response( 'main.webauthn_begin_register', - _raw_response=True, ) webauthn_options = cbor.decode(response.data)['publicKey'] @@ -86,9 +85,8 @@ def test_begin_register_includes_existing_credentials( ) client_request.login(platform_admin_user) - response = client_request.get( + response = client_request.get_response( 'main.webauthn_begin_register', - _raw_response=True, ) webauthn_options = cbor.decode(response.data)['publicKey'] @@ -105,13 +103,10 @@ def test_begin_register_stores_state_in_session( return_value=[]) client_request.login(platform_admin_user) - response = client_request.get( + client_request.get_response( 'main.webauthn_begin_register', - _raw_response=True, ) - assert response.status_code == 200 - with client_request.session_transaction() as session: assert session['webauthn_registration_state'] is not None @@ -135,11 +130,10 @@ def test_complete_register_creates_credential( ) client_request.login(platform_admin_user) - client_request.post( + client_request.post_response( 'main.webauthn_begin_register', _data=cbor.encode('public_key_credential'), _expected_status=200, - _raw_response=True, ) credential_mock.assert_called_once_with('state', 'public_key_credential') @@ -190,10 +184,9 @@ def test_complete_register_handles_library_errors( ) client_request.login(platform_admin_user) - client_request.post( + client_request.post_response( 'main.webauthn_complete_register', _data=cbor.encode('public_key_credential'), - _raw_response=True, _expected_status=400, ) @@ -204,10 +197,9 @@ def test_complete_register_handles_missing_state( mocker, ): client_request.login(platform_admin_user) - response = client_request.post( + response = client_request.post_response( 'main.webauthn_complete_register', _data=cbor.encode('public_key_credential'), - _raw_response=True, _expected_status=400, ) diff --git a/tests/app/main/views/uploads/test_upload_contact_list.py b/tests/app/main/views/uploads/test_upload_contact_list.py index 45db1e48a..4596f412e 100644 --- a/tests/app/main/views/uploads/test_upload_contact_list.py +++ b/tests/app/main/views/uploads/test_upload_contact_list.py @@ -660,11 +660,10 @@ def test_download_contact_list( 'app.models.contact_list.s3download', return_value='phone number\n07900900321' ) - response = client_request.get( + response = client_request.get_response( 'main.download_contact_list', service_id=SERVICE_ONE_ID, contact_list_id=fake_uuid, - _raw_response=True, ) assert response.headers['Content-Type'] == ( 'text/csv; ' diff --git a/tests/conftest.py b/tests/conftest.py index 076b1b684..d5c03cd73 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -2789,7 +2789,6 @@ def client_request(_logged_in_client, mocker, service_one): # noqa (C901 too co _test_page_title=True, _test_for_elements_without_class=True, _optional_args="", - _raw_response=False, **endpoint_kwargs ): return ClientRequest.get_url( @@ -2799,7 +2798,6 @@ def client_request(_logged_in_client, mocker, service_one): # noqa (C901 too co _expected_redirect=_expected_redirect, _test_page_title=_test_page_title, _test_for_elements_without_class=_test_for_elements_without_class, - _raw_response=_raw_response, ) @staticmethod @@ -2810,7 +2808,6 @@ def client_request(_logged_in_client, mocker, service_one): # noqa (C901 too co _expected_redirect=None, _test_page_title=True, _test_for_elements_without_class=True, - _raw_response=False, **endpoint_kwargs ): resp = _logged_in_client.get( @@ -2826,9 +2823,6 @@ def client_request(_logged_in_client, mocker, service_one): # noqa (C901 too co if _expected_redirect: assert resp.location == _expected_redirect - if _raw_response: - return resp - page = BeautifulSoup(resp.data.decode('utf-8'), 'html.parser') if _test_page_title: count_of_h1s = len(page.select('h1')) @@ -2865,7 +2859,6 @@ def client_request(_logged_in_client, mocker, service_one): # noqa (C901 too co _expected_status=None, _follow_redirects=False, _expected_redirect=None, - _raw_response=False, _content_type=None, **endpoint_kwargs ): @@ -2885,7 +2878,6 @@ def client_request(_logged_in_client, mocker, service_one): # noqa (C901 too co _expected_status=None, _follow_redirects=False, _expected_redirect=None, - _raw_response=False, _content_type=None, ): if _expected_status is None: @@ -2902,8 +2894,7 @@ def client_request(_logged_in_client, mocker, service_one): # noqa (C901 too co assert resp.status_code == _expected_status if _expected_redirect: assert_url_expected(resp.location, _expected_redirect) - if _raw_response: - return resp + return BeautifulSoup(resp.data.decode('utf-8'), 'html.parser') @staticmethod