diff --git a/app/templates/service_navigation.html b/app/templates/service_navigation.html index b8d100447..3eb5a3aa2 100644 --- a/app/templates/service_navigation.html +++ b/app/templates/service_navigation.html @@ -23,9 +23,7 @@ {% else %} {{ broadcast_channel|title }} {% endif %} - {% if allowed_broadcast_provider == "all" %} - (all networks) - {% else %} + {% if allowed_broadcast_provider != "all" %} ({{ allowed_broadcast_provider|format_mobile_network }}) {% endif %} {% endif %} diff --git a/tests/app/main/views/test_broadcast.py b/tests/app/main/views/test_broadcast.py index f92748616..00f6365c2 100644 --- a/tests/app/main/views/test_broadcast.py +++ b/tests/app/main/views/test_broadcast.py @@ -318,16 +318,16 @@ def test_some_broadcast_tour_pages_show_service_name( 'severe', 'all', '.navigation-service-type.navigation-service-type--live', - 'service one Live (all networks) Switch service', - 'Live (all networks)', + 'service one Live Switch service', + 'Live', ), ( False, 'test', 'all', '.navigation-service-type.navigation-service-type--test', - 'service one Test (all networks) Switch service', - 'Test (all networks)', + 'service one Test Switch service', + 'Test', ), ( False, @@ -342,8 +342,8 @@ def test_some_broadcast_tour_pages_show_service_name( 'government', 'all', '.navigation-service-type.navigation-service-type--government', - 'service one Government (all networks) Switch service', - 'Government (all networks)', + 'service one Government Switch service', + 'Government', ), ( False, diff --git a/tests/app/main/views/test_service_settings.py b/tests/app/main/views/test_service_settings.py index 02b468a96..8a0e823f6 100644 --- a/tests/app/main/views/test_service_settings.py +++ b/tests/app/main/views/test_service_settings.py @@ -203,10 +203,10 @@ 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", "severe", "all", "Live (all networks)"), + (True, "live", "test", "all", "Test"), + (True, "live", "severe", "all", "Live"), (True, "live", "severe", "three", "Live (Three)"), - (True, "live", "government", "all", "Government (all networks)"), + (True, "live", "government", "all", "Government"), (True, "live", "government", "three", "Government (Three)"), ] ) @@ -5802,13 +5802,13 @@ def test_post_service_set_broadcast_network_makes_you_choose( 'this service.', ]), ('live-test', [ - 'Test (all networks)', + 'Test', 'Members of the public who have switched on the test ' 'channel on their phones will receive alerts sent from ' 'this service.', ]), ('live-severe', [ - 'Live (all networks)', + 'Live', 'Members of the public will receive alerts sent from this ' 'service.', ]), @@ -5818,7 +5818,7 @@ def test_post_service_set_broadcast_network_makes_you_choose( 'service.', ]), ('live-government', [ - 'Government (all networks)', + 'Government', 'Members of the public will receive alerts sent from this ' 'service, even if they’ve opted out.' ]),