darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-06 05:28:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2292 from alphagov/require-name-branding

Browse Source 
Require name when adding email branding
This commit is contained in:
Chris Hill-Scott
2018-09-06 15:33:45 +01:00
committed by GitHub
parent eb1bae3046 1bd7df7797
commit cc364c87a4
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/main/forms.py
View File

@@ -729,7 +729,7 @@ class GovernmentDomainField(StringField):
class ServiceUpdateEmailBranding(StripWhitespaceForm): class ServiceUpdateEmailBranding(StripWhitespaceForm):
name = StringField('Name of brand') name = StringField('Name of brand', validators=[DataRequired()])
text = StringField('Text') text = StringField('Text')
domain = GovernmentDomainField('Domain') domain = GovernmentDomainField('Domain')
colour = StringField( colour = StringField(

15
tests/app/main/views/test_email_branding.py
View File

@@ -284,7 +284,10 @@ def test_deletes_previous_temp_logo_after_uploading_logo(
logged_in_platform_admin_client.post( logged_in_platform_admin_client.post(
url_for('main.create_email_branding', logo=temp_old_filename, branding_id=fake_uuid), url_for('main.create_email_branding', logo=temp_old_filename, branding_id=fake_uuid),
data={'file': (BytesIO(''.encode('utf-8')), 'test.png')}, data={
'file': (BytesIO(''.encode('utf-8')), 'test.png'),
'name': 'Test',
},
content_type='multipart/form-data' content_type='multipart/form-data'
) )
@@ -361,7 +364,10 @@ def test_temp_logo_is_shown_after_uploading_logo(
response = logged_in_platform_admin_client.post( response = logged_in_platform_admin_client.post(
url_for('main.create_email_branding'), url_for('main.create_email_branding'),
data={'file': (BytesIO(''.encode('utf-8')), 'test.png')}, data={
'file': (BytesIO(''.encode('utf-8')), 'test.png'),
'name': 'Test',
},
content_type='multipart/form-data', content_type='multipart/form-data',
follow_redirects=True follow_redirects=True
) )
@@ -391,7 +397,10 @@ def test_logo_persisted_when_organisation_saved(
resp = logged_in_platform_admin_client.post( resp = logged_in_platform_admin_client.post(
url_for('.create_email_branding', logo=temp_filename), url_for('.create_email_branding', logo=temp_filename),
content_type='multipart/form-data' content_type='multipart/form-data',
data={
'name': 'Test',
}
) )
assert resp.status_code == 302 assert resp.status_code == 302