Merge pull request #2448 from alphagov/alphabetical-sort-letter-brandings

Make letter brandings easier to find with sorting and filtering

tests/app/main/views/test_service_settings.py

@@ -2088,9 +2088,22 @@ def test_set_letter_branding_platform_admin_only(
     assert response.status_code == 403
 
 
-@pytest.mark.parametrize('current_dvla_org_id, expected_selected', [
-    (None, '001'),
-    ('500', '500'),
+@pytest.mark.parametrize('current_dvla_org_id, expected_selected, expected_items', [
+    (None, '001', (
+        ('001', 'HM Government'),
+        ('999', 'Animal and Plant Health Agency'),
+        ('500', 'Land Registry'),
+    )),
+    ('500', '500', (
+        ('500', 'Land Registry'),
+        ('001', 'HM Government'),
+        ('999', 'Animal and Plant Health Agency'),
+    )),
+    ('999', '999', (
+        ('999', 'Animal and Plant Health Agency'),
+        ('001', 'HM Government'),
+        ('500', 'Land Registry'),
+    )),
 ])
 def test_set_letter_branding_prepopulates(
     logged_in_platform_admin_client,
@@ -2098,12 +2111,23 @@ def test_set_letter_branding_prepopulates(
     mock_get_letter_email_branding,
     current_dvla_org_id,
     expected_selected,
+    expected_items,
 ):
     if current_dvla_org_id:
         service_one['dvla_organisation'] = current_dvla_org_id
     response = logged_in_platform_admin_client.get(url_for('main.set_letter_branding', service_id=service_one['id']))
     assert response.status_code == 200
     page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
+
+    for element in {'label[for^=dvla_org_id]', 'input[type=radio]'}:
+        assert len(page.select(element)) == len(expected_items)
+
+    for index, expected_item in enumerate(expected_items):
+        expected_value, expected_label = expected_item
+        assert normalize_spaces(page.select('label[for^=dvla_org_id]')[index].text) == expected_label
+        assert page.select('input[type=radio]')[index]['value'] == expected_value
+
+    assert len(page.select('input[checked]')) == 1
     assert page.select('input[checked]')[0]['value'] == expected_selected
 
 

tests/conftest.py

@@ -2492,6 +2492,7 @@ def mock_get_letter_email_branding(mocker):
         return {
             '001': 'HM Government',
             '500': 'Land Registry',
+            '999': 'Animal and Plant Health Agency',
         }
 
     return mocker.patch(