diff --git a/app/main/views/service_settings.py b/app/main/views/service_settings.py index 97b708291..5f1c6e9fe 100644 --- a/app/main/views/service_settings.py +++ b/app/main/views/service_settings.py @@ -186,12 +186,12 @@ def service_switch_can_send_letters(service_id): return redirect(url_for('.service_settings', service_id=service_id)) -@main.route("/services//service-settings/deactivate", methods=['GET', 'POST']) +@main.route("/services//service-settings/archive", methods=['GET', 'POST']) @login_required @user_has_permissions('manage_settings', admin_override=True) -def deactivate_service(service_id): +def archive_service(service_id): if request.method == 'POST': - service_api_client.deactivate_service(service_id) + service_api_client.archive_service(service_id) return redirect(url_for('.service_settings', service_id=service_id)) else: flash('There\'s no way to reverse this! Are you sure you want to archive this service?', 'delete') diff --git a/app/notify_client/service_api_client.py b/app/notify_client/service_api_client.py index 0c5d8811b..2eff775f3 100644 --- a/app/notify_client/service_api_client.py +++ b/app/notify_client/service_api_client.py @@ -103,8 +103,8 @@ class ServiceAPIClient(NotifyAdminAPIClient): def update_service_with_properties(self, service_id, properties): return self.update_service(service_id, **properties) - def deactivate_service(self, service_id): - return self.post('/service/{}/deactivate'.format(service_id), data=None) + def archive_service(self, service_id): + return self.post('/service/{}/archive'.format(service_id), data=None) def remove_user_from_service(self, service_id, user_id): """ diff --git a/app/templates/views/service-settings.html b/app/templates/views/service-settings.html index 76337e5df..d19efd6bf 100644 --- a/app/templates/views/service-settings.html +++ b/app/templates/views/service-settings.html @@ -111,7 +111,7 @@ {% if current_service.active %}
  • - + Archive service
  • diff --git a/tests/app/main/views/test_service_settings.py b/tests/app/main/views/test_service_settings.py index 4090ec366..677a9b917 100644 --- a/tests/app/main/views/test_service_settings.py +++ b/tests/app/main/views/test_service_settings.py @@ -396,7 +396,7 @@ def test_log_error_on_request_to_go_live( 'main.service_name_change', 'main.service_name_change_confirm', 'main.service_request_to_go_live', - 'main.deactivate_service' + 'main.archive_service' ]) def test_route_permissions(mocker, app_, api_user_active, service_one, route): with app_.test_request_context(): @@ -419,7 +419,7 @@ def test_route_permissions(mocker, app_, api_user_active, service_one, route): 'main.service_switch_live', 'main.service_switch_research_mode', 'main.service_switch_can_send_letters', - 'main.deactivate_service', + 'main.archive_service', ]) def test_route_invalid_permissions(mocker, app_, api_user_active, service_one, route): with app_.test_request_context(): @@ -458,7 +458,7 @@ def test_route_for_platform_admin(mocker, app_, platform_admin_user, service_one 'main.service_switch_can_send_letters', ]) def test_route_for_platform_admin_update_service(mocker, app_, platform_admin_user, service_one, route): - mocker.patch('app.service_api_client.deactivate_service') + mocker.patch('app.service_api_client.archive_service') with app_.test_request_context(): validate_route_permission(mocker, app_, @@ -750,22 +750,22 @@ def test_switch_service_disable_letters(client, platform_admin_user, mocker): assert mocked_fn.call_args == call(service['id'], {"can_send_letters": False}) -def test_deactivate_service_after_confirm(client, platform_admin_user, service_one, mocker): +def test_archive_service_after_confirm(client, platform_admin_user, service_one, mocker): mocked_fn = mocker.patch('app.service_api_client.post', return_value=service_one) client.login(platform_admin_user, mocker, service_one) - response = client.post(url_for('main.deactivate_service', service_id=service_one['id'])) + response = client.post(url_for('main.archive_service', 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) - assert mocked_fn.call_args == call('/service/{}/deactivate'.format(service_one['id']), data=None) + assert mocked_fn.call_args == call('/service/{}/archive'.format(service_one['id']), data=None) -def test_deactivate_service_prompts_user(client, platform_admin_user, service_one, mocker): +def test_archive_service_prompts_user(client, platform_admin_user, service_one, mocker): mocked_fn = mocker.patch('app.service_api_client.post') client.login(platform_admin_user, mocker, service_one) - response = client.get(url_for('main.deactivate_service', service_id=service_one['id'])) + response = client.get(url_for('main.archive_service', service_id=service_one['id'])) assert response.status_code == 200 page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser') @@ -773,7 +773,7 @@ def test_deactivate_service_prompts_user(client, platform_admin_user, service_on assert mocked_fn.called is False -def test_cant_deactivate_inactive_service(client, platform_admin_user, service_one, mocker): +def test_cant_archive_inactive_service(client, platform_admin_user, service_one, mocker): service_one['active'] = False client.login(platform_admin_user, mocker, service_one)