darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-02 20:59:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

Be explicit that ‘test’ goes out on real networks

Browse Source 
Adding ‘all networks’ whenever we mention the using the test channel
without a restriction to a single network should help reinforce that
this sends real alerts.
This commit is contained in:
Chris Hill-Scott
2021-05-12 11:33:09 +01:00
parent e45bd485e8
commit d38f44ec69
5 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/templates/views/service-settings.html
View File

@@ -436,7 +436,7 @@
{% else %}
{% if current_service.live and current_service.broadcast_channel == "government" %}Government{% endif %}
{% if current_service.live and current_service.broadcast_channel == "severe" %}Live{% endif %}
{% if current_service.live and current_service.broadcast_channel == "test" %}Test {% if current_service.allowed_broadcast_provider != "all" %}({{ current_service.allowed_broadcast_provider|format_mobile_network }}){% else %}(All networks){% endif %}{%endif%}
{% if current_service.live and current_service.broadcast_channel == "test" %}Test {% if current_service.allowed_broadcast_provider != "all" %}({{ current_service.allowed_broadcast_provider|format_mobile_network }}){% else %}(all networks){% endif %}{%endif%}
{% if not current_service.live%}Training {% endif%}
{% endif %}
{% endcall %}

3
app/templates/views/service-settings/service-confirm-broadcast-account-type.html
View File

@@ -33,6 +33,9 @@
{% if form.account_type.provider_restriction != 'all' %}
({{ form.account_type.provider_restriction|format_mobile_network }})
{% endif %}
{% if form.account_type.broadcast_channel == 'test' and form.account_type.provider_restriction == 'all'%}
(all networks)
{% endif %}
</span>
</p>
<p class="govuk-body">

4
app/templates/withnav_template.html
View File

@@ -26,7 +26,9 @@
<span class="navigation-service-type navigation-service-type--live">Live
{% elif current_service.broadcast_channel == 'test' %}
<span class="navigation-service-type navigation-service-type--live">{{ current_service.broadcast_channel|title }}
{% if current_service.allowed_broadcast_provider != "all" %}
{% if current_service.allowed_broadcast_provider == "all" %}
(all networks)
{% else %}
({{ current_service.allowed_broadcast_provider }})
{% endif %}
{% else %}

29
tests/app/main/views/test_broadcast.py
View File

@@ -291,8 +291,16 @@ def test_broadcast_tour_page_4_shows_service_name(
(
(
True,
"all",
None,
'all',
'.navigation-service-type.navigation-service-type--training',
'service one Training Switch service',
'Training',
),
(
True,
'test',
'all',
'.navigation-service-type.navigation-service-type--training',
'service one Training Switch service',
'Training',
@@ -300,12 +308,19 @@ def test_broadcast_tour_page_4_shows_service_name(
(
False,
'severe',
"all",
'all',
'.navigation-service-type.navigation-service-type--live',
'service one Live Switch service',
'Live',
),
(
False,
'test',
'all',
'.navigation-service-type.navigation-service-type--live',
'service one Test (all networks) Switch service',
'Test (all networks)',
),
(
False,
'test',
@@ -314,14 +329,6 @@ def test_broadcast_tour_page_4_shows_service_name(
'service one Test (vodafone) Switch service',
'Test (vodafone)',
),
(
False,
'test',
'all',
'.navigation-service-type.navigation-service-type--live',
'service one Test Switch service',
'Test',
),
(
False,
'government',

4
tests/app/main/views/test_service_settings.py
View File

@@ -203,7 +203,7 @@ def test_platform_admin_sees_only_relevant_settings_for_broadcast_service(
(True, "training", "test", "all", "Training"),
(True, "live", "test", "ee", "Test (EE)"),
(True, "live", "test", "three", "Test (Three)"),
(True, "live", "test", "all", "Test (All networks)"),
(True, "live", "test", "all", "Test (all networks)"),
(True, "live", "severe", "all", "Live"),
]
)
@@ -5777,7 +5777,7 @@ def test_post_service_set_broadcast_network_makes_you_choose(
'this service.',
]),
('live-test', [
'Test',
'Test (all networks)',
'Members of the public who have switched on the test '
'channel on their phones will receive alerts sent from '
'this service.',