From fd05bed600335a9652f82d46f36cf68dc56bf0f6 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Mon, 13 Jul 2020 09:34:49 +0100 Subject: [PATCH] Remove references to email, text and letters in trial mode MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We don’t know what trial mode for broadcast services is going to look like, but it’s not going to involve sending emails. --- app/templates/views/service-settings.html | 26 ++++++++++-------- tests/app/main/views/test_service_settings.py | 27 +++++++++++++++++++ 2 files changed, 42 insertions(+), 11 deletions(-) diff --git a/app/templates/views/service-settings.html b/app/templates/views/service-settings.html index 9899de72c..09f253413 100644 --- a/app/templates/views/service-settings.html +++ b/app/templates/views/service-settings.html @@ -252,13 +252,15 @@ {% if current_service.trial_mode %}

Your service is in trial mode

-

You can only:

+ {% if not current_service.has_permission('broadcast') %} +

You can only:

- + + {% endif %}

{% if current_user.has_permissions('manage_service') %} @@ -272,11 +274,13 @@ {% else %}

Your service is live

-

- You can send up to - {{ "{:,}".format(current_service.message_limit) }} messages - per day. -

+ {% if not current_service.has_permission('broadcast') %} +

+ You can send up to + {{ "{:,}".format(current_service.message_limit) }} messages + per day. +

+ {% endif %}

Problems or comments? Give feedback. diff --git a/tests/app/main/views/test_service_settings.py b/tests/app/main/views/test_service_settings.py index 55e402004..0d830ee00 100644 --- a/tests/app/main/views/test_service_settings.py +++ b/tests/app/main/views/test_service_settings.py @@ -510,6 +510,7 @@ def test_service_name_change_fails_if_new_name_has_less_than_2_alphanumeric_char ]) def test_show_restricted_service( client_request, + service_one, single_reply_to_email_address, single_letter_contact_block, mock_get_organisation, @@ -539,6 +540,32 @@ def test_show_restricted_service( assert not request_to_live_link +def test_show_restricted_broadcast_service( + client_request, + service_one, + single_reply_to_email_address, + single_letter_contact_block, + mock_get_organisation, + single_sms_sender, + mock_get_service_settings_page_common, +): + service_one['permissions'] = 'broadcast' + page = client_request.get( + 'main.service_settings', + service_id=SERVICE_ONE_ID, + ) + + assert page.select('main h2')[0].text == 'Your service is in trial mode' + + request_to_live = page.select_one('main p') + request_to_live_link = request_to_live.select_one('a') + assert normalize_spaces(page.select_one('main p').text) == ( + 'To remove these restrictions, you can send us a request to go live.' + ) + assert request_to_live_link['href'] == url_for('main.request_to_go_live', service_id=SERVICE_ONE_ID) + assert not page.select_one('main ul') + + @freeze_time("2017-04-01 11:09:00.061258") def test_switch_service_to_live( client_request,