From c960fef8f8de9f37d55f765d22f05c206b4e22ec Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Mon, 5 Nov 2018 13:34:26 +0000 Subject: [PATCH] Always put HM Government at the top of the list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It’s the default, so we should treat it the same way we treat GOV.UK in the email branding selection. --- app/main/forms.py | 6 ++++-- tests/app/main/views/test_service_settings.py | 8 ++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/main/forms.py b/app/main/forms.py index f5929ee80..3e38b80a8 100644 --- a/app/main/forms.py +++ b/app/main/forms.py @@ -1,7 +1,6 @@ import weakref from datetime import datetime, timedelta from itertools import chain -from operator import itemgetter import pytz from flask_wtf import FlaskForm as Form @@ -788,7 +787,10 @@ class LetterBranding(StripWhitespaceForm): super().__init__(*args, **kwargs) self.dvla_org_id.choices = list(sorted( choices, - key=itemgetter(1), + key=lambda choice: ( + choice[0] != '001', + choice[1], + ), )) dvla_org_id = RadioField( diff --git a/tests/app/main/views/test_service_settings.py b/tests/app/main/views/test_service_settings.py index e7f36b77f..1565e0d81 100644 --- a/tests/app/main/views/test_service_settings.py +++ b/tests/app/main/views/test_service_settings.py @@ -2106,11 +2106,11 @@ def test_set_letter_branding_prepopulates( for element in {'label', 'input[type=radio]'}: assert len(page.select(element)) == 3 - assert normalize_spaces(page.select('label')[0].text) == 'Animal and Plant Health Agency' - assert page.select('input')[0]['value'] == '999' + assert normalize_spaces(page.select('label')[0].text) == 'HM Government' + assert page.select('input')[0]['value'] == '001' - assert normalize_spaces(page.select('label')[1].text) == 'HM Government' - assert page.select('input')[1]['value'] == '001' + assert normalize_spaces(page.select('label')[1].text) == 'Animal and Plant Health Agency' + assert page.select('input')[1]['value'] == '999' assert normalize_spaces(page.select('label')[2].text) == 'Land Registry' assert page.select('input')[2]['value'] == '500'