darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-07-13 17:59:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3871 from alphagov/remove-training-mode-test-channels

Browse Source 
Remove some of the option we have for broadcast services.
This commit is contained in:
Rebecca Law
2021-05-06 15:05:29 +01:00
committed by GitHub
parent bfc55b45ca cf160c3ae1
commit e7d6eebdfe
3 changed files with 32 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/main/forms.py
View File

@@ -2342,17 +2342,13 @@ class ServiceBroadcastAccountTypeForm(StripWhitespaceForm):
'Change cell broadcast service type',
thing='which type of account this cell broadcast service is',
choices=[
("training-test-ee", "Training mode - EE network - Test channel only"),
("training-test-o2", "Training mode - O2 network - Test channel only"),
("training-test-three", "Training mode - Three network - Test channel only"),
("training-test-vodafone", "Training mode - Vodafone network - Test channel only"),
("training-severe", "Training mode - All networks - Public channel"),
("live-test-ee", "Live - EE network - Test channel only"),
("live-test-o2", "Live - O2 network - Test channel only"),
("live-test-three", "Live - Three network - Test channel only"),
("live-test-vodafone", "Live - Vodafone network - Test channel only"),
("live-test", "Live - All networks - Test channel only"),
("live-severe", "Live - All networks - Public channel"),
("training-test", "Training mode"),
("live-test-ee", "Test channel (EE)"),
("live-test-o2", "Test channel (O2)"),
("live-test-three", "Test channel (Three)"),
("live-test-vodafone", "Test channel (Vodafone)"),
("live-test", "Test channel (all networks)"),
("live-severe", "Live (all networks)"),
],
validators=[DataRequired()]
)

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

@@ -434,7 +434,9 @@
{% if not current_service.broadcast_channel %}
Off
{% else %}
{% if current_service.live %}Live{% else %}Training mode{% endif %} - {% if current_service.allowed_broadcast_provider %}{{ current_service.allowed_broadcast_provider|format_mobile_network }} network{% else %}All networks{% endif %} - {% if current_service.broadcast_channel == "test" %}Test channel only{% else %}Public channel{% 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 %}({{ current_service.allowed_broadcast_provider|format_mobile_network }}){% else %}(All networks){% endif %}{%endif%}
{% if not current_service.live%}Training {% endif%}
{% endif %}
{% endcall %}
{{ edit_field(

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

@@ -186,8 +186,7 @@ def test_platform_admin_sees_only_relevant_settings_for_broadcast_service(
'Label Value Action',
'Notes None Change the notes for the service',
'Email authentication Off Change your settings for Email authentication',
'Send cell broadcasts Training mode - All networks - Public channel '
+ 'Change your settings for Send cell broadcasts',
'Send cell broadcasts Training Change your settings for Send cell broadcasts',
]
assert len(rows) == len(expected_rows)
@@ -201,11 +200,11 @@ def test_platform_admin_sees_only_relevant_settings_for_broadcast_service(
[
(False, "training", None, None, "Off"),
(False, "live", None, None, "Off"),
(True, "training", "severe", None, "Training mode - All networks - Public channel"),
(True, "training", "test", "ee", "Training mode - EE network - Test channel only"),
(True, "live", "test", "three", "Live - Three network - Test channel only"),
(True, "live", "test", None, "Live - All networks - Test channel only"),
(True, "live", "severe", None, "Live - All networks - Public channel"),
(True, "training", "test", None, "Training"),
(True, "live", "test", "ee", "Test (EE)"),
(True, "live", "test", "three", "Test (Three)"),
(True, "live", "test", None, "Test (All networks)"),
(True, "live", "severe", None, "Live"),
]
)
def test_platform_admin_sees_correct_description_of_broadcast_service_setting(
@@ -5429,17 +5428,13 @@ def test_get_service_set_broadcast_account_type(
assert page.select_one('h1').text.strip() == "Change cell broadcast service type"
expected_labels = [
"Training mode - EE network - Test channel only",
"Training mode - O2 network - Test channel only",
"Training mode - Three network - Test channel only",
"Training mode - Vodafone network - Test channel only",
"Training mode - All networks - Public channel",
"Live - EE network - Test channel only",
"Live - O2 network - Test channel only",
"Live - Three network - Test channel only",
"Live - Vodafone network - Test channel only",
"Live - All networks - Test channel only",
"Live - All networks - Public channel",
"Training mode",
"Test channel (EE)",
"Test channel (O2)",
"Test channel (Three)",
"Test channel (Vodafone)",
"Test channel (all networks)",
"Live (all networks)",
]
labels = page.find_all('label', class_="govuk-radios__label")
assert len(labels) == len(expected_labels)
@@ -5470,37 +5465,23 @@ def test_get_service_set_broadcast_account_type_has_no_radio_selected_for_non_br
[
(
"training",
"severe",
"test",
None,
"Training mode - All networks - Public channel",
"training-severe",
"Training mode",
"training-test",
),
(
"training",
"live",
"test",
"vodafone",
"Training mode - Vodafone network - Test channel only",
"training-test-vodafone",
),
(
"live",
"test",
"o2",
"Live - O2 network - Test channel only",
"live-test-o2",
),
(
"live",
"test",
None,
"Live - All networks - Test channel only",
"live-test",
"Test channel (Vodafone)",
"live-test-vodafone",
),
(
"live",
"severe",
None,
"Live - All networks - Public channel",
"Live (all networks)",
"live-severe",
),
]
@@ -5543,10 +5524,8 @@ def test_get_service_set_broadcast_account_type_has_radio_selected_for_broadcast
@pytest.mark.parametrize(
'value,service_mode,broadcast_channel,allowed_broadcast_provider',
[
("training-severe", "training", "severe", None),
("training-test-vodafone", "training", "test", "vodafone"),
("live-test-o2", "live", "test", "o2"),
("live-test", "live", "test", None),
("training-test", "training", "test", None),
("live-test-vodafone", "live", "test", "vodafone"),
("live-severe", "live", "severe", None),
]
)