From 3f7142b3e2a46a3806f43c7950f6839c98ebf165 Mon Sep 17 00:00:00 2001
From: Tom Byers <tombaromba@gmail.com>
Date: Fri, 7 Aug 2020 14:06:51 +0100
Subject: [PATCH] Update fields on ServiceLetterBrandingDetails

Changes its StringField to GovukTextInputField.

Includes changes to templates that use this form
and associated tests.
---
 app/main/forms.py                              |  2 +-
 .../manage-letter-branding.html                |  4 +++-
 tests/app/main/views/test_letter_branding.py   | 18 +++++++++---------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/app/main/forms.py b/app/main/forms.py
index 19cc8498f..d730293ed 100644
--- a/app/main/forms.py
+++ b/app/main/forms.py
@@ -1695,7 +1695,7 @@ class SVGFileUpload(StripWhitespaceForm):
 
 
 class ServiceLetterBrandingDetails(StripWhitespaceForm):
-    name = StringField('Name of brand', validators=[DataRequired()])
+    name = GovukTextInputField('Name of brand', validators=[DataRequired()])
 
 
 class PDFUploadForm(StripWhitespaceForm):
diff --git a/app/templates/views/letter-branding/manage-letter-branding.html b/app/templates/views/letter-branding/manage-letter-branding.html
index 98104192b..c60a136b4 100644
--- a/app/templates/views/letter-branding/manage-letter-branding.html
+++ b/app/templates/views/letter-branding/manage-letter-branding.html
@@ -28,7 +28,9 @@
       {{ file_upload(file_upload_form.file, button_text='{} logo'.format('Update' if is_update else 'Upload')) }}
       {% call form_wrapper() %}
         <div class="form-group">
-          <div style='margin-top:15px;'>{{textbox(letter_branding_details_form.name)}}</div>
+          {{ letter_branding_details_form.name(param_extensions={
+            "formGroup": {"classes": "govuk-!-margin-top-3"}
+          }) }}
           {{ page_footer(
             'Save',
             button_name='operation',
diff --git a/tests/app/main/views/test_letter_branding.py b/tests/app/main/views/test_letter_branding.py
index 83b1e64ae..a1b756f96 100644
--- a/tests/app/main/views/test_letter_branding.py
+++ b/tests/app/main/views/test_letter_branding.py
@@ -192,11 +192,11 @@ def test_update_letter_branding_shows_form_errors_on_name_fields(
     )
 
     page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
-    error_messages = page.find_all('span', class_='error-message')
+    error_messages = page.find_all('span', class_='govuk-error-message')
 
     assert page.find('h1').text == 'Update letter branding'
     assert len(error_messages) == 1
-    assert error_messages[0].text.strip() == 'This field is required.'
+    assert 'This field is required.' in error_messages[0].text.strip()
 
 
 def test_update_letter_branding_shows_database_errors_on_name_field(
@@ -229,10 +229,10 @@ def test_update_letter_branding_shows_database_errors_on_name_field(
     )
 
     page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
-    error_message = page.find('span', class_='error-message').text.strip()
+    error_message = page.find('span', class_='govuk-error-message').text.strip()
 
     assert page.find('h1').text == 'Update letter branding'
-    assert error_message == 'name already in use'
+    assert 'name already in use' in error_message
 
 
 def test_update_letter_branding_with_new_file_and_new_details(
@@ -311,7 +311,7 @@ def test_create_letter_branding_does_not_show_branding_info(platform_admin_clien
     page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
 
     assert page.select_one('#logo-img > img') is None
-    assert page.select_one('#name').attrs.get('value') == ''
+    assert page.select_one('#name').attrs.get('value') is None
 
 
 def test_create_letter_branding_when_uploading_valid_file(
@@ -511,11 +511,11 @@ def test_create_letter_branding_shows_form_errors_on_name_field(
     )
 
     page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
-    error_messages = page.find_all('span', class_='error-message')
+    error_messages = page.find_all('span', class_='govuk-error-message')
 
     assert page.find('h1').text == 'Add letter branding'
     assert len(error_messages) == 1
-    assert error_messages[0].text.strip() == 'This field is required.'
+    assert 'This field is required.' in error_messages[0].text.strip()
 
 
 def test_create_letter_branding_shows_database_errors_on_name_fields(
@@ -552,7 +552,7 @@ def test_create_letter_branding_shows_database_errors_on_name_fields(
     )
 
     page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
-    error_message = page.find('span', class_='error-message').text.strip()
+    error_message = page.find('span', class_='govuk-error-message').text.strip()
 
     assert page.find('h1').text == 'Add letter branding'
-    assert error_message == 'name already in use'
+    assert 'name already in use' in error_message