darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-07-16 19:30:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update fields on ServiceLetterBrandingDetails

Browse Source 
Changes its StringField to GovukTextInputField.

Includes changes to templates that use this form
and associated tests.
This commit is contained in:
Tom Byers
2020-08-07 14:06:51 +01:00
parent 852ef61aad
commit 3f7142b3e2
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/main/forms.py
View File

@@ -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):

4
app/templates/views/letter-branding/manage-letter-branding.html
View File

@@ -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',

18
tests/app/main/views/test_letter_branding.py
View File

@@ -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