diff --git a/tests/__init__.py b/tests/__init__.py index 8aef7db2e..d6b042e6d 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -661,7 +661,7 @@ def broadcast_message_json( 'personalisation': {}, 'areas': [ - 'england', 'scotland', + 'countries-E92000001', 'countries-S92000003', ], 'status': status, diff --git a/tests/app/broadcast_areas/test_broadcast_area.py b/tests/app/broadcast_areas/test_broadcast_area.py index a172ef019..d0305c05e 100644 --- a/tests/app/broadcast_areas/test_broadcast_area.py +++ b/tests/app/broadcast_areas/test_broadcast_area.py @@ -89,10 +89,18 @@ def test_get_names_of_areas(): def test_get_areas_accepts_lists(): areas_from_list = broadcast_area_libraries.get_areas( - ['wales', 'vale-of-glamorgan', 'england', 'essex'] + [ + 'countries-W92000004', + 'counties-and-unitary-authorities-in-england-and-wales-W06000014', + 'countries-E92000001', + 'counties-and-unitary-authorities-in-england-and-wales-E10000012', + ] ) areas_from_args = broadcast_area_libraries.get_areas( - 'wales', 'vale-of-glamorgan', 'england', 'essex', + 'countries-W92000004', + 'counties-and-unitary-authorities-in-england-and-wales-W06000014', + 'countries-E92000001', + 'counties-and-unitary-authorities-in-england-and-wales-E10000012', ) assert areas_from_args == areas_from_list diff --git a/tests/app/main/views/test_broadcast.py b/tests/app/main/views/test_broadcast.py index 33e2f95d0..bf87e5474 100644 --- a/tests/app/main/views/test_broadcast.py +++ b/tests/app/main/views/test_broadcast.py @@ -38,7 +38,7 @@ sample_uuid = sample_uuid() 403, 403, ), ( - '.remove_broadcast_area', {'broadcast_message_id': sample_uuid, 'area_slug': 'england'}, + '.remove_broadcast_area', {'broadcast_message_id': sample_uuid, 'area_slug': 'countries-E92000001'}, 403, 405, ), ( @@ -237,9 +237,13 @@ def test_choose_broadcast_library_page( 'Regions of England', ]) - hints = page.select('.file-list-hint-large') - for country in ('England, Northern Ireland, Scotland, Wales'): - assert country in hints + assert any([ + all([ + country in hint.text + for country in ('England', 'Northern Ireland', 'Scotland', 'Wales') + ]) + for hint in page.select('.file-list-hint-large') + ]) assert page.select_one('a.file-list-filename-large.govuk-link')['href'] == url_for( '.choose_broadcast_area', @@ -278,14 +282,14 @@ def test_add_broadcast_area( broadcast_message_id=fake_uuid, library_slug='countries', _data={ - 'areas': ['england', 'wales'] + 'areas': ['countries-E92000001', 'countries-W92000004'] } ) mock_update_broadcast_message.assert_called_once_with( service_id=SERVICE_ONE_ID, broadcast_message_id=fake_uuid, data={ - 'areas': ['england', 'scotland', 'wales'] + 'areas': ['countries-E92000001', 'countries-S92000003', 'countries-W92000004'] }, ) @@ -302,7 +306,7 @@ def test_remove_broadcast_area_page( '.remove_broadcast_area', service_id=SERVICE_ONE_ID, broadcast_message_id=fake_uuid, - area_slug='england', + area_slug='countries-E92000001', _expected_redirect=url_for( '.preview_broadcast_areas', service_id=SERVICE_ONE_ID, @@ -314,7 +318,7 @@ def test_remove_broadcast_area_page( service_id=SERVICE_ONE_ID, broadcast_message_id=fake_uuid, data={ - 'areas': ['scotland'] + 'areas': ['countries-S92000003'] }, )