From 6ffd8b9b2e3d8c3b0ee969ab6b0090c5e771e3dd Mon Sep 17 00:00:00 2001 From: venusbb Date: Fri, 11 Aug 2017 09:17:01 +0100 Subject: [PATCH] test written before merge Kens change --- app/main/views/service_settings.py | 1 - app/notify_client/inbound_number_client.py | 6 +- tests/app/main/views/test_service_settings.py | 697 ++++++++++-------- 3 files changed, 396 insertions(+), 308 deletions(-) diff --git a/app/main/views/service_settings.py b/app/main/views/service_settings.py index 7e0ece827..d38f65d29 100644 --- a/app/main/views/service_settings.py +++ b/app/main/views/service_settings.py @@ -81,7 +81,6 @@ def service_settings(service_id): inbound_api_url=inbound_api_url, letter_contact_block=Field(current_service['letter_contact_block'], html='escape'), inbound_number=disp_inbound_number - ) diff --git a/app/notify_client/inbound_number_client.py b/app/notify_client/inbound_number_client.py index d3fd6cd02..896156c41 100644 --- a/app/notify_client/inbound_number_client.py +++ b/app/notify_client/inbound_number_client.py @@ -16,13 +16,13 @@ class InboundNumberClient(NotifyAdminAPIClient): return self.get(endpoint) def get_inbound_sms_number_for_service(self, service_id): - return self.get('/inbound_number/{}/number'.format(service_id)) + return self.get('/inbound_number/service/{}'.format(service_id)) def activate_inbound_sms_service(self, service_id, inbound_number_id): - return self.post(url='/inbound_number/{}/service/{}/activate'.format(inbound_number_id, service_id), data={}) + return self.post(url='/inbound_number/{}/service/{}'.format(inbound_number_id, service_id), data={}) def reactivate_inbound_sms_service(self, inbound_number_id): - return self.post(url='/inbound_number/{}/reactivate'.format(inbound_number_id), data={}) + return self.post(url='/inbound_number/{}/on'.format(inbound_number_id), data={}) def deactivate_inbound_sms_permission(self, inbound_number_id): return self.post(url='/inbound_number/{}/off'.format(inbound_number_id), data={}) diff --git a/tests/app/main/views/test_service_settings.py b/tests/app/main/views/test_service_settings.py index 637a0ef82..854352b97 100644 --- a/tests/app/main/views/test_service_settings.py +++ b/tests/app/main/views/test_service_settings.py @@ -43,14 +43,14 @@ from tests.conftest import active_user_with_permissions, platform_admin_user ]), ]) def test_should_show_overview( - client, - mocker, - service_one, - fake_uuid, - mock_get_letter_organisations, - user, - expected_rows, - mock_get_inbound_number_for_service + client, + mocker, + service_one, + fake_uuid, + mock_get_letter_organisations, + user, + expected_rows, + mock_get_inbound_number_for_service ): service_one['permissions'] = ['sms', 'email'] @@ -92,15 +92,15 @@ def test_should_show_overview( ]), ]) def test_should_show_overview_for_service_with_more_things_set( - client, - active_user_with_permissions, - mocker, - service_with_reply_to_addresses, - mock_get_organisation, - mock_get_letter_organisations, - mock_get_inbound_number_for_service, - permissions, - expected_rows + client, + active_user_with_permissions, + mocker, + service_with_reply_to_addresses, + mock_get_organisation, + mock_get_letter_organisations, + mock_get_inbound_number_for_service, + permissions, + expected_rows ): client.login(active_user_with_permissions, mocker, service_with_reply_to_addresses) service_with_reply_to_addresses['permissions'] = permissions @@ -118,14 +118,14 @@ def test_should_show_overview_for_service_with_more_things_set( ('https://test.url.com', 'https://test.url.com'), ]) def test_service_settings_show_elided_api_url_if_needed( - logged_in_platform_admin_client, - service_one, - mock_get_letter_organisations, - mocker, - fake_uuid, - url, - elided_url, - mock_get_inbound_number_for_service + logged_in_platform_admin_client, + service_one, + mock_get_letter_organisations, + mocker, + fake_uuid, + url, + elided_url, + mock_get_inbound_number_for_service ): service_one['permissions'] = ['sms', 'email', 'inbound_sms'] service_one['inbound_api'] = [fake_uuid] @@ -150,10 +150,10 @@ def test_service_settings_show_elided_api_url_if_needed( def test_if_cant_send_letters_then_cant_see_letter_contact_block( - logged_in_client, - service_one, - mock_get_letter_organisations, - mock_get_inbound_number_for_service + logged_in_client, + service_one, + mock_get_letter_organisations, + mock_get_inbound_number_for_service ): response = logged_in_client.get(url_for( 'main.service_settings', service_id=service_one['id'] @@ -162,10 +162,10 @@ def test_if_cant_send_letters_then_cant_see_letter_contact_block( def test_if_can_receive_inbound_then_cant_change_sms_sender( - logged_in_client, - service_one, - mock_get_letter_organisations, - mock_get_inbound_number_for_service + logged_in_client, + service_one, + mock_get_letter_organisations, + mock_get_inbound_number_for_service ): service_one['permissions'] = ['email', 'sms', 'inbound_sms'] response = logged_in_client.get(url_for( @@ -179,13 +179,12 @@ def test_if_can_receive_inbound_then_cant_change_sms_sender( assert '0781239871' in response.get_data(as_text=True) - def test_letter_contact_block_shows_none_if_not_set( - logged_in_client, - service_one, - mocker, - mock_get_letter_organisations, - mock_get_inbound_number_for_service + logged_in_client, + service_one, + mocker, + mock_get_letter_organisations, + mock_get_inbound_number_for_service ): service_one['permissions'] = ['letter'] response = logged_in_client.get(url_for( @@ -199,11 +198,11 @@ def test_letter_contact_block_shows_none_if_not_set( def test_escapes_letter_contact_block( - logged_in_client, - service_one, - mocker, - mock_get_letter_organisations, - mock_get_inbound_number_for_service + logged_in_client, + service_one, + mocker, + mock_get_letter_organisations, + mock_get_inbound_number_for_service ): service_one['permissions'] = ['letter'] service_one['letter_contact_block'] = 'foo\nbar' @@ -218,8 +217,8 @@ def test_escapes_letter_contact_block( def test_should_show_service_name( - logged_in_client, - service_one, + logged_in_client, + service_one, ): response = logged_in_client.get(url_for( 'main.service_name_change', service_id=service_one['id'])) @@ -231,10 +230,10 @@ def test_should_show_service_name( def test_should_redirect_after_change_service_name( - logged_in_client, - service_one, - mock_update_service, - mock_get_services, + logged_in_client, + service_one, + mock_update_service, + mock_get_services, ): response = logged_in_client.post( url_for('main.service_name_change', service_id=service_one['id']), @@ -248,10 +247,10 @@ def test_should_redirect_after_change_service_name( def test_show_restricted_service( - logged_in_client, - service_one, - mock_get_letter_organisations, - mock_get_inbound_number_for_service + logged_in_client, + service_one, + mock_get_letter_organisations, + mock_get_inbound_number_for_service ): response = logged_in_client.get(url_for('main.service_settings', service_id=service_one['id'])) page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser') @@ -260,10 +259,10 @@ def test_show_restricted_service( def test_switch_service_to_live( - logged_in_platform_admin_client, - service_one, - mock_update_service, - mock_get_inbound_number_for_service + logged_in_platform_admin_client, + service_one, + mock_update_service, + mock_get_inbound_number_for_service ): response = logged_in_platform_admin_client.get( url_for('main.service_switch_live', service_id=service_one['id'])) @@ -279,11 +278,11 @@ def test_switch_service_to_live( def test_show_live_service( - logged_in_client, - service_one, - mock_get_live_service, - mock_get_letter_organisations, - mock_get_inbound_number_for_service + logged_in_client, + service_one, + mock_get_live_service, + mock_get_letter_organisations, + mock_get_inbound_number_for_service ): response = logged_in_client.get(url_for('main.service_settings', service_id=service_one['id'])) page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser') @@ -292,11 +291,11 @@ def test_show_live_service( def test_switch_service_to_restricted( - logged_in_platform_admin_client, - service_one, - mock_get_live_service, - mock_update_service, - mock_get_inbound_number_for_service + logged_in_platform_admin_client, + service_one, + mock_get_live_service, + mock_update_service, + mock_get_inbound_number_for_service ): response = logged_in_platform_admin_client.get( url_for('main.service_switch_live', service_id=service_one['id'])) @@ -312,9 +311,9 @@ def test_switch_service_to_restricted( def test_should_not_allow_duplicate_names( - logged_in_client, - mocker, - service_one, + logged_in_client, + mocker, + service_one, ): mocker.patch('app.service_api_client.find_all_service_email_from', return_value=['service_one', 'service.two']) @@ -330,8 +329,8 @@ def test_should_not_allow_duplicate_names( def test_should_show_service_name_confirmation( - logged_in_client, - service_one, + logged_in_client, + service_one, ): response = logged_in_client.get(url_for( 'main.service_name_change_confirm', service_id=service_one['id'])) @@ -343,11 +342,11 @@ def test_should_show_service_name_confirmation( def test_should_redirect_after_service_name_confirmation( - logged_in_client, - service_one, - mock_update_service, - mock_verify_password, - mock_get_inbound_number_for_service + logged_in_client, + service_one, + mock_update_service, + mock_verify_password, + mock_get_inbound_number_for_service ): service_id = service_one['id'] service_new_name = 'New Name' @@ -368,10 +367,10 @@ def test_should_redirect_after_service_name_confirmation( def test_should_raise_duplicate_name_handled( - logged_in_client, - service_one, - mock_update_service_raise_httperror_duplicate_name, - mock_verify_password + logged_in_client, + service_one, + mock_update_service_raise_httperror_duplicate_name, + mock_verify_password ): service_new_name = 'New Name' with logged_in_client.session_transaction() as session: @@ -388,9 +387,9 @@ def test_should_raise_duplicate_name_handled( def test_should_show_request_to_go_live( - logged_in_client, - mock_get_service, - service_one + logged_in_client, + mock_get_service, + service_one ): response = logged_in_client.get( url_for('main.service_request_to_go_live', service_id=service_one['id'])) @@ -401,12 +400,12 @@ def test_should_show_request_to_go_live( def test_should_redirect_after_request_to_go_live( - logged_in_client, - active_user_with_permissions, - service_one, - mocker, - mock_get_letter_organisations, - mock_get_inbound_number_for_service + logged_in_client, + active_user_with_permissions, + service_one, + mocker, + mock_get_letter_organisations, + mock_get_inbound_number_for_service ): mock_post = mocker.patch( 'app.main.views.feedback.requests.post', @@ -452,10 +451,10 @@ def test_should_redirect_after_request_to_go_live( def test_log_error_on_request_to_go_live( - app_, - logged_in_client, - service_one, - mocker, + app_, + logged_in_client, + service_one, + mocker, ): mock_post = mocker.patch( 'app.main.views.service_settings.requests.post', @@ -493,14 +492,14 @@ def test_log_error_on_request_to_go_live( 'main.archive_service' ]) def test_route_permissions( - mocker, - app_, - client, - api_user_active, - service_one, - mock_get_letter_organisations, - route, - mock_get_inbound_number_for_service + mocker, + app_, + client, + api_user_active, + service_one, + mock_get_letter_organisations, + route, + mock_get_inbound_number_for_service ): validate_route_permission( mocker, @@ -525,12 +524,12 @@ def test_route_permissions( 'main.archive_service', ]) def test_route_invalid_permissions( - mocker, - app_, - client, - api_user_active, - service_one, - route, + mocker, + app_, + client, + api_user_active, + service_one, + route, ): validate_route_permission( mocker, @@ -550,14 +549,14 @@ def test_route_invalid_permissions( 'main.service_request_to_go_live', ]) def test_route_for_platform_admin( - mocker, - app_, - client, - platform_admin_user, - service_one, - mock_get_letter_organisations, - route, - mock_get_inbound_number_for_service + mocker, + app_, + client, + platform_admin_user, + service_one, + mock_get_letter_organisations, + route, + mock_get_inbound_number_for_service ): validate_route_permission(mocker, app_, @@ -576,13 +575,13 @@ def test_route_for_platform_admin( 'main.service_switch_can_send_international_sms', ]) def test_route_for_platform_admin_update_service( - mocker, - app_, - client, - platform_admin_user, - service_one, - mock_get_letter_organisations, - route, + mocker, + app_, + client, + platform_admin_user, + service_one, + mock_get_letter_organisations, + route, ): mocker.patch('app.service_api_client.archive_service') validate_route_permission(mocker, @@ -602,13 +601,13 @@ def test_route_for_platform_admin_update_service( ('sms', ['sms'], []) ]) def test_enabling_and_disabling_email_and_sms( - logged_in_platform_admin_client, - service_one, - mocker, - notification_type, - permissions_before_switch, - permissions_after_switch, - mock_get_inbound_number_for_service + logged_in_platform_admin_client, + service_one, + mocker, + notification_type, + permissions_before_switch, + permissions_after_switch, + mock_get_inbound_number_for_service ): service_one['permissions'] = permissions_before_switch mocked_fn = mocker.patch('app.service_api_client.update_service_with_properties', return_value=service_one) @@ -623,11 +622,11 @@ def test_enabling_and_disabling_email_and_sms( def test_set_reply_to_email_address( - logged_in_client, - mock_update_service, - service_one, - mock_get_letter_organisations, - mock_get_inbound_number_for_service + logged_in_client, + mock_update_service, + service_one, + mock_get_letter_organisations, + mock_get_inbound_number_for_service ): service_one['permissions'] = ['email'] data = {"email_address": "test@someservice.gov.uk"} @@ -642,9 +641,9 @@ def test_set_reply_to_email_address( def test_if_reply_to_email_address_set_then_form_populated( - logged_in_client, - service_one, - mock_get_inbound_number_for_service + logged_in_client, + service_one, + mock_get_inbound_number_for_service ): service_one['permissions'] = ['email'] service_one['reply_to_email_address'] = 'test@service.gov.uk' @@ -656,10 +655,10 @@ def test_if_reply_to_email_address_set_then_form_populated( def test_switch_service_to_research_mode( - logged_in_platform_admin_client, - platform_admin_user, - service_one, - mocker, + logged_in_platform_admin_client, + platform_admin_user, + service_one, + mocker, ): mocker.patch('app.service_api_client.post', return_value=service_one) response = logged_in_platform_admin_client.get( @@ -677,8 +676,8 @@ def test_switch_service_to_research_mode( def test_switch_service_from_research_mode_to_normal( - logged_in_platform_admin_client, - mocker, + logged_in_platform_admin_client, + mocker, ): service = service_json( research_mode=True @@ -697,11 +696,11 @@ def test_switch_service_from_research_mode_to_normal( def test_shows_research_mode_indicator( - logged_in_client, - service_one, - mocker, - mock_get_letter_organisations, - mock_get_inbound_number_for_service + logged_in_client, + service_one, + mocker, + mock_get_letter_organisations, + mock_get_inbound_number_for_service ): service_one['research_mode'] = True mocker.patch('app.service_api_client.update_service_with_properties', return_value=service_one) @@ -715,10 +714,10 @@ def test_shows_research_mode_indicator( def test_does_not_show_research_mode_indicator( - logged_in_client, - service_one, - mock_get_letter_organisations, - mock_get_inbound_number_for_service + logged_in_client, + service_one, + mock_get_letter_organisations, + mock_get_inbound_number_for_service ): response = logged_in_client.get(url_for('main.service_settings', service_id=service_one['id'])) assert response.status_code == 200 @@ -729,11 +728,11 @@ def test_does_not_show_research_mode_indicator( def test_set_text_message_sender( - logged_in_client, - mock_update_service, - service_one, - mock_get_letter_organisations, - mock_get_inbound_number_for_service + logged_in_client, + mock_update_service, + service_one, + mock_get_letter_organisations, + mock_get_inbound_number_for_service ): data = {"sms_sender": "elevenchars"} response = logged_in_client.post(url_for('main.service_set_sms_sender', service_id=service_one['id']), @@ -747,12 +746,102 @@ def test_set_text_message_sender( ) +def test_get_inbound_number_in_service_settings( + logged_in_client, + mock_update_service, + mock_get_letter_organisations, + service_one, + mocker +): + mocker_get_inbound_number_fun = mocker.patch( + 'app.inbound_number_client.get_inbound_sms_number_for_service', + return_value={'data': {'number': '077777777', 'id': 'some_uuid'}}) + + response = logged_in_client.get(url_for('main.service_settings', service_id=service_one['id'])) + assert response.status_code == 200 + mocker_get_inbound_number_fun.assert_called_once_with(service_one['id']) + + page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser') + element = page.find('span', {"id": "077777777"}) + assert not element + + +def test_get_inbound_number_confirm_page( + logged_in_client, + mock_update_service, + service_one, + mocker +): + mocker_get_inbound_number_fun = mocker.patch( + 'app.inbound_number_client.get_inbound_sms_number_for_service', + return_value={'data': {'number': '077777777', 'id': 'some_uuid'}}) + + response = logged_in_client.get(url_for('main.service_set_inbound_number', service_id=service_one['id']), + ) + + assert response.status_code == 200 + assert '077777777' in response.get_data(as_text=True) + + mocker_get_inbound_number_fun.assert_called_once_with(service_one['id']) + + +def test_if_currently_inbound_number_is_none( + logged_in_client, + mock_update_service, + service_one, + mocker +): + mocker_get_inbound_number_fun = mocker.patch( + 'app.inbound_number_client.get_inbound_sms_number_for_service', + return_value={'data': ''}) + + mocker_get_available_inbound_number_fun = mocker.patch( + 'app.inbound_number_client.get_available_inbound_number', + return_value={'data': {'number': '0123445678', 'id': 'some_uuid'}}) + + mocker_get_activate_inbound_number_fun = mocker.patch( + 'app.inbound_number_client.activate_inbound_sms_service') + + response = logged_in_client.post(url_for('main.service_set_inbound_number', service_id=service_one['id']), + ) + + assert response.status_code == 302 + assert response.location == url_for('main.service_settings', service_id=service_one['id'], _external=True) + + mocker_get_inbound_number_fun.assert_called_once_with(service_one['id']) + mocker_get_available_inbound_number_fun.assert_called_once_with(service_one['id']) + mocker_get_activate_inbound_number_fun.assert_called_once_with(service_one['id'], 'some_uuid') + + +def test_if_currently_inbound_number_is_not_empty( + logged_in_client, + mock_update_service, + service_one, + mocker +): + mocker_get_inbound_number_fun = mocker.patch( + 'app.inbound_number_client.get_inbound_sms_number_for_service', + return_value={'data': {'number': '077777777', 'id': 'some_uuid'}}) + + mocker_get_reactivate_inbound_number_fun = mocker.patch( + 'app.inbound_number_client.reactivate_inbound_sms_service') + + response = logged_in_client.post(url_for('main.service_set_inbound_number', service_id=service_one['id']), + ) + + assert response.status_code == 302 + assert response.location == url_for('main.service_settings', service_id=service_one['id'], _external=True) + + mocker_get_inbound_number_fun.assert_called_once_with(service_one['id']) + mocker_get_reactivate_inbound_number_fun.assert_called_once_with('some_uuid') + + def test_set_text_message_sender_and_inbound_sms( - logged_in_client, - service_one, - mock_get_letter_organisations, - mocker, - mock_get_inbound_number_for_service + logged_in_client, + service_one, + mock_get_letter_organisations, + mocker, + mock_get_inbound_number_for_service ): service_one['permissions'] = [] update_service_mock = mocker.patch('app.service_api_client.update_service_with_properties', @@ -774,11 +863,11 @@ def test_set_text_message_sender_and_inbound_sms( def test_turn_inbound_sms_off( - logged_in_client, - service_one, - mock_get_letter_organisations, - mocker, - mock_get_inbound_number_for_service + logged_in_client, + service_one, + mock_get_letter_organisations, + mocker, + mock_get_inbound_number_for_service ): service_one['permissions'] = ['inbound_sms'] update_service_mock = mocker.patch('app.service_api_client.update_service_with_properties', @@ -800,11 +889,11 @@ def test_turn_inbound_sms_off( def test_set_text_message_sender_and_not_inbound_sms( - logged_in_client, - service_one, - mock_get_letter_organisations, - mocker, - mock_get_inbound_number_for_service + logged_in_client, + service_one, + mock_get_letter_organisations, + mocker, + mock_get_inbound_number_for_service ): service_one['permissions'] = [] update_service_mock = mocker.patch('app.service_api_client.update_service', @@ -830,13 +919,13 @@ def test_set_text_message_sender_and_not_inbound_sms( (".", "Use letters and numbers only") ]) def test_set_text_message_sender_validation( - logged_in_client, - mock_update_service, - service_one, - mock_get_letter_organisations, - mock_get_inbound_number_for_service, - content, - expected_error, + logged_in_client, + mock_update_service, + service_one, + mock_get_letter_organisations, + mock_get_inbound_number_for_service, + content, + expected_error, ): response = logged_in_client.post(url_for( 'main.service_set_sms_sender', @@ -857,13 +946,13 @@ def test_set_text_message_sender_validation( ("https://test.com", "123456789", "Must be at least 10 characters"), ]) def test_set_inbound_api_validation( - logged_in_client, - mock_update_service, - service_one, - mock_get_letter_organisations, - url, - bearer_token, - expected_errors, + logged_in_client, + mock_update_service, + service_one, + mock_get_letter_organisations, + url, + bearer_token, + expected_errors, ): service_one['permissions'] = ['inbound_sms'] response = logged_in_client.post(url_for( @@ -880,9 +969,9 @@ def test_set_inbound_api_validation( def test_if_sms_sender_set_then_form_populated( - logged_in_client, - service_one, - mock_get_inbound_number_for_service + logged_in_client, + service_one, + mock_get_inbound_number_for_service ): service_one['sms_sender'] = 'elevenchars' response = logged_in_client.get(url_for('main.service_set_sms_sender', service_id=service_one['id'])) @@ -894,9 +983,9 @@ def test_if_sms_sender_set_then_form_populated( @pytest.mark.parametrize('method', ['get', 'post']) def test_cant_set_letter_contact_block_if_service_cant_send_letters( - logged_in_client, - service_one, - method + logged_in_client, + service_one, + method ): assert 'letter' not in service_one['permissions'] response = getattr(logged_in_client, method)( @@ -906,8 +995,8 @@ def test_cant_set_letter_contact_block_if_service_cant_send_letters( def test_set_letter_contact_block_prepopulates( - logged_in_client, - service_one + logged_in_client, + service_one ): service_one['permissions'] = ['letter'] service_one['letter_contact_block'] = 'foo bar baz waz' @@ -917,9 +1006,9 @@ def test_set_letter_contact_block_prepopulates( def test_set_letter_contact_block_saves( - logged_in_client, - service_one, - mock_update_service, + logged_in_client, + service_one, + mock_update_service, ): service_one['permissions'] = ['letter'] response = logged_in_client.post( @@ -932,9 +1021,9 @@ def test_set_letter_contact_block_saves( def test_set_letter_contact_block_redirects_to_template( - logged_in_client, - service_one, - mock_update_service, + logged_in_client, + service_one, + mock_update_service, ): service_one['permissions'] = ['letter'] fake_template_id = uuid.uuid4() @@ -956,9 +1045,9 @@ def test_set_letter_contact_block_redirects_to_template( def test_set_letter_contact_block_has_max_10_lines( - logged_in_client, - service_one, - mock_update_service, + logged_in_client, + service_one, + mock_update_service, ): service_one['permissions'] = ['letter'] response = logged_in_client.post( @@ -972,8 +1061,8 @@ def test_set_letter_contact_block_has_max_10_lines( def test_set_letter_branding_platform_admin_only( - logged_in_client, - service_one, + logged_in_client, + service_one, ): response = logged_in_client.get(url_for('main.set_letter_branding', service_id=service_one['id'])) assert response.status_code == 403 @@ -984,11 +1073,11 @@ def test_set_letter_branding_platform_admin_only( ('500', '500'), ]) def test_set_letter_branding_prepopulates( - logged_in_platform_admin_client, - service_one, - mock_get_letter_organisations, - current_dvla_org_id, - expected_selected, + logged_in_platform_admin_client, + service_one, + mock_get_letter_organisations, + current_dvla_org_id, + expected_selected, ): if current_dvla_org_id: service_one['dvla_organisation'] = current_dvla_org_id @@ -999,10 +1088,10 @@ def test_set_letter_branding_prepopulates( def test_set_letter_contact_block_saves( - logged_in_platform_admin_client, - service_one, - mock_update_service, - mock_get_letter_organisations, + logged_in_platform_admin_client, + service_one, + mock_update_service, + mock_get_letter_organisations, ): response = logged_in_platform_admin_client.post( url_for('main.set_letter_branding', service_id=service_one['id']), @@ -1014,10 +1103,10 @@ def test_set_letter_contact_block_saves( def test_should_show_branding( - logged_in_platform_admin_client, - service_one, - mock_get_organisations, - mock_get_letter_organisations, + logged_in_platform_admin_client, + service_one, + mock_get_organisations, + mock_get_letter_organisations, ): response = logged_in_platform_admin_client.get(url_for( 'main.service_set_branding_and_org', service_id=service_one['id'] @@ -1038,9 +1127,9 @@ def test_should_show_branding( def test_should_show_organisations( - logged_in_platform_admin_client, - service_one, - mock_get_organisations + logged_in_platform_admin_client, + service_one, + mock_get_organisations ): response = logged_in_platform_admin_client.get(url_for( 'main.service_set_branding_and_org', service_id=service_one['id'] @@ -1061,10 +1150,10 @@ def test_should_show_organisations( def test_should_set_branding_and_organisations( - logged_in_platform_admin_client, - service_one, - mock_get_organisations, - mock_update_service, + logged_in_platform_admin_client, + service_one, + mock_get_organisations, + mock_update_service, ): response = logged_in_platform_admin_client.post( url_for( @@ -1087,9 +1176,9 @@ def test_should_set_branding_and_organisations( def test_switch_service_enable_letters( - logged_in_platform_admin_client, - service_one, - mocker, + logged_in_platform_admin_client, + service_one, + mocker, ): mocked_fn = mocker.patch('app.service_api_client.update_service_with_properties', return_value=service_one) @@ -1104,9 +1193,9 @@ def test_switch_service_enable_letters( def test_switch_service_disable_letters( - logged_in_platform_admin_client, - service_one, - mocker, + logged_in_platform_admin_client, + service_one, + mocker, ): service_one['permissions'] = ['letter'] mocked_fn = mocker.patch('app.service_api_client.update_service_with_properties', return_value=service_one) @@ -1121,9 +1210,9 @@ def test_switch_service_disable_letters( def test_switch_service_enable_international_sms( - logged_in_platform_admin_client, - service_one, - mocker, + logged_in_platform_admin_client, + service_one, + mocker, ): mocked_fn = mocker.patch('app.service_api_client.update_service_with_properties', return_value=service_one) @@ -1138,9 +1227,9 @@ def test_switch_service_enable_international_sms( def test_switch_service_disable_international_sms( - logged_in_platform_admin_client, - service_one, - mocker, + logged_in_platform_admin_client, + service_one, + mocker, ): service_one['permissions'] = ['international_sms'] mocked_fn = mocker.patch('app.service_api_client.update_service_with_properties', return_value=service_one) @@ -1155,9 +1244,9 @@ def test_switch_service_disable_international_sms( def test_set_new_inbound_api_and_valid_bearer_token_calls_create_inbound_api_endpoint( - logged_in_platform_admin_client, - service_one, - mocker, + logged_in_platform_admin_client, + service_one, + mocker, ): service_one['permissions'] = ['inbound_sms'] service_one['inbound_api'] = [] @@ -1188,11 +1277,11 @@ def test_set_new_inbound_api_and_valid_bearer_token_calls_create_inbound_api_end ] ) def test_update_inbound_api_and_valid_bearer_token_calls_update_inbound_api_endpoint( - logged_in_platform_admin_client, - service_one, - mocker, - fake_uuid, - inbound_api_data + logged_in_platform_admin_client, + service_one, + mocker, + fake_uuid, + inbound_api_data ): service_one['permissions'] = ['inbound_sms'] service_one['inbound_api'] = [fake_uuid] @@ -1233,10 +1322,10 @@ def test_update_inbound_api_and_valid_bearer_token_calls_update_inbound_api_endp def test_save_inbound_api_without_changes_does_not_update_inbound_api( - logged_in_platform_admin_client, - service_one, - mocker, - fake_uuid + logged_in_platform_admin_client, + service_one, + mocker, + fake_uuid ): service_one['permissions'] = ['inbound_sms'] service_one['inbound_api'] = [fake_uuid] @@ -1260,10 +1349,10 @@ def test_save_inbound_api_without_changes_does_not_update_inbound_api( def test_archive_service_after_confirm( - logged_in_platform_admin_client, - service_one, - mocker, - mock_get_inbound_number_for_service + logged_in_platform_admin_client, + service_one, + mocker, + mock_get_inbound_number_for_service ): mocked_fn = mocker.patch('app.service_api_client.post', return_value=service_one) @@ -1275,11 +1364,11 @@ def test_archive_service_after_confirm( def test_archive_service_prompts_user( - logged_in_platform_admin_client, - service_one, - mocker, - mock_get_letter_organisations, - mock_get_inbound_number_for_service + logged_in_platform_admin_client, + service_one, + mocker, + mock_get_letter_organisations, + mock_get_inbound_number_for_service ): mocked_fn = mocker.patch('app.service_api_client.post') @@ -1292,10 +1381,10 @@ def test_archive_service_prompts_user( def test_cant_archive_inactive_service( - logged_in_platform_admin_client, - service_one, - mock_get_letter_organisations, - mock_get_inbound_number_for_service + logged_in_platform_admin_client, + service_one, + mock_get_letter_organisations, + mock_get_inbound_number_for_service ): service_one['active'] = False @@ -1307,10 +1396,10 @@ def test_cant_archive_inactive_service( def test_suspend_service_after_confirm( - logged_in_platform_admin_client, - service_one, - mocker, - mock_get_inbound_number_for_service + logged_in_platform_admin_client, + service_one, + mocker, + mock_get_inbound_number_for_service ): mocked_fn = mocker.patch('app.service_api_client.post', return_value=service_one) @@ -1322,11 +1411,11 @@ def test_suspend_service_after_confirm( def test_suspend_service_prompts_user( - logged_in_platform_admin_client, - service_one, - mocker, - mock_get_letter_organisations, - mock_get_inbound_number_for_service + logged_in_platform_admin_client, + service_one, + mocker, + mock_get_letter_organisations, + mock_get_inbound_number_for_service ): mocked_fn = mocker.patch('app.service_api_client.post') @@ -1340,10 +1429,10 @@ def test_suspend_service_prompts_user( def test_cant_suspend_inactive_service( - logged_in_platform_admin_client, - service_one, - mock_get_letter_organisations, - mock_get_inbound_number_for_service + logged_in_platform_admin_client, + service_one, + mock_get_letter_organisations, + mock_get_inbound_number_for_service ): service_one['active'] = False @@ -1355,10 +1444,10 @@ def test_cant_suspend_inactive_service( def test_resume_service_after_confirm( - logged_in_platform_admin_client, - service_one, - mocker, - mock_get_inbound_number_for_service + logged_in_platform_admin_client, + service_one, + mocker, + mock_get_inbound_number_for_service ): service_one['active'] = False mocked_fn = mocker.patch('app.service_api_client.post', return_value=service_one) @@ -1371,11 +1460,11 @@ def test_resume_service_after_confirm( def test_resume_service_prompts_user( - logged_in_platform_admin_client, - service_one, - mocker, - mock_get_letter_organisations, - mock_get_inbound_number_for_service + logged_in_platform_admin_client, + service_one, + mocker, + mock_get_letter_organisations, + mock_get_inbound_number_for_service ): service_one['active'] = False mocked_fn = mocker.patch('app.service_api_client.post') @@ -1390,10 +1479,10 @@ def test_resume_service_prompts_user( def test_cant_resume_active_service( - logged_in_platform_admin_client, - service_one, - mock_get_letter_organisations, - mock_get_inbound_number_for_service + logged_in_platform_admin_client, + service_one, + mock_get_letter_organisations, + mock_get_inbound_number_for_service ): response = logged_in_platform_admin_client.get(url_for('main.service_settings', service_id=service_one['id'])) @@ -1404,25 +1493,25 @@ def test_cant_resume_active_service( @pytest.mark.parametrize('endpoint, expected_p', [ ( - 'main.service_set_international_sms', - ( - 'Sending text messages to international phone numbers is ' - 'an invitation‑only feature.' - ) + 'main.service_set_international_sms', + ( + 'Sending text messages to international phone numbers is ' + 'an invitation‑only feature.' + ) ), ( - 'main.service_set_letters', - ( - 'Using GOV.UK Notify to send letters is an invitation‑only ' - 'feature.' - ) + 'main.service_set_letters', + ( + 'Using GOV.UK Notify to send letters is an invitation‑only ' + 'feature.' + ) ), ]) def test_invitation_pages( - logged_in_client, - service_one, - endpoint, - expected_p, + logged_in_client, + service_one, + endpoint, + expected_p, ): response = logged_in_client.get(url_for(endpoint, service_id=service_one['id']))