From 4ddd3aa1555ec83354453a83fee3749f7f228f5b Mon Sep 17 00:00:00 2001 From: Leo Hemsted Date: Thu, 3 May 2018 17:00:05 +0100 Subject: [PATCH] use client_request to always check the response this'll avoid us accidentally 503ing and ignoring it in tests where we check for "assert my_content not present" --- tests/app/main/views/test_api_integration.py | 9 ++++++--- tests/app/main/views/test_manage_users.py | 7 ++++--- tests/app/main/views/test_service_settings.py | 12 +++++++----- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/tests/app/main/views/test_api_integration.py b/tests/app/main/views/test_api_integration.py index 01e412764..148bdb9c5 100644 --- a/tests/app/main/views/test_api_integration.py +++ b/tests/app/main/views/test_api_integration.py @@ -141,14 +141,17 @@ def test_letter_notifications_should_show_client_reference( def test_should_show_api_page_for_live_service( - logged_in_client, + client_request, mock_login, api_user_active, + mock_get_notifications, mock_get_live_service, mock_has_permissions ): - response = logged_in_client.get(url_for('main.api_integration', service_id=str(uuid.uuid4()))) - page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser') + page = client_request.get( + 'main.api_integration', + service_id=uuid.uuid4() + ) assert 'Your service is in trial mode' not in page.find('main').text diff --git a/tests/app/main/views/test_manage_users.py b/tests/app/main/views/test_manage_users.py index bc39a5d9c..3b4f29708 100644 --- a/tests/app/main/views/test_manage_users.py +++ b/tests/app/main/views/test_manage_users.py @@ -555,13 +555,14 @@ def test_user_cant_invite_themselves( def test_no_permission_manage_users_page( - logged_in_client, + client_request, service_one, + mock_get_users_by_service, + mock_get_invites_for_service, api_user_active, mocker, ): - response = logged_in_client.get(url_for('main.manage_users', service_id=service_one['id'])) - resp_text = response.get_data(as_text=True) + resp_text = client_request.get('main.manage_users', service_id=service_one['id']) assert url_for('.invite_user', service_id=service_one['id']) not in resp_text assert "Edit permission" not in resp_text assert "Team members" not in resp_text diff --git a/tests/app/main/views/test_service_settings.py b/tests/app/main/views/test_service_settings.py index 0adc8711c..e1ffe82cd 100644 --- a/tests/app/main/views/test_service_settings.py +++ b/tests/app/main/views/test_service_settings.py @@ -192,14 +192,16 @@ def test_should_show_overview_for_service_with_more_things_set( def test_if_cant_send_letters_then_cant_see_letter_contact_block( - logged_in_client, + client_request, service_one, + single_reply_to_email_address, + no_letter_contact_blocks, + mock_get_service_organisation, + single_sms_sender, mock_get_service_settings_page_common, ): - response = logged_in_client.get(url_for( - 'main.service_settings', service_id=service_one['id'] - )) - assert 'Letter contact block' not in response.get_data(as_text=True) + response = client_request.get('main.service_settings', service_id=service_one['id']) + assert 'Letter contact block' not in response def test_letter_contact_block_shows_none_if_not_set(