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

Stop checking for allowed_broadcast_provider being None

Browse Source 
The current_service.allowed_broadcast_provider is now always "all" or
one of the four providers, which means we can simply the code by not
checking if it is None.
This commit is contained in:
Katie Smith
2021-05-10 16:55:05 +01:00
parent 91453d3639
commit f7036825df
5 changed files with 3 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -287,20 +287,6 @@ def test_broadcast_tour_page_4_shows_service_name(
@pytest.mark.parametrize('trial_mode, allowed_broadcast_provider, selector, expected_text, expected_tagged_text', (
(
True,
None,
'.navigation-service-type.navigation-service-type--training',
'service one Training Switch service',
'Training',
),
(
False,
None,
'.navigation-service-type.navigation-service-type--live',
'service one Live Switch service',
'Live',
),
(
True,
"all",

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

@@ -198,17 +198,12 @@ def test_platform_admin_sees_only_relevant_settings_for_broadcast_service(
@pytest.mark.parametrize(
'has_broadcast_permission,service_mode,broadcast_channel,allowed_broadcast_provider,expected_text',
[
(False, "training", None, None, "Off"),
(False, "training", None, "all", "Off"),
(False, "live", None, None, "Off"),
(False, "live", None, "all", "Off"),
(True, "training", "test", None, "Training"),
(True, "training", "test", "all", "Training"),
(True, "live", "test", "ee", "Test (EE)"),
(True, "live", "test", "three", "Test (Three)"),
(True, "live", "test", None, "Test (All networks)"),
(True, "live", "test", "all", "Test (All networks)"),
(True, "live", "severe", None, "Live"),
(True, "live", "severe", "all", "Live"),
]
)
@@ -5468,13 +5463,6 @@ def test_get_service_set_broadcast_account_type_has_no_radio_selected_for_non_br
@pytest.mark.parametrize(
'service_mode,broadcast_channel,allowed_broadcast_provider,expected_text,expected_value',
[
(
"training",
"test",
None,
"Training mode",
"training-test",
),
(
"training",
"test",
@@ -5489,13 +5477,6 @@ def test_get_service_set_broadcast_account_type_has_no_radio_selected_for_non_br
"Test channel (Vodafone)",
"live-test-vodafone",
),
(
"live",
"severe",
None,
"Live (all networks)",
"live-severe",
),
(
"live",
"severe",