From 51cc2a5296b286396c5bd1c35799b4c870913e1e Mon Sep 17 00:00:00 2001
From: Tom Byers <tombaromba@gmail.com>
Date: Wed, 16 Dec 2020 11:24:52 +0000
Subject: [PATCH] Set accepted files for branding upload

---
 app/templates/views/email-branding/manage-branding.html         | 2 +-
 app/templates/views/letter-branding/manage-letter-branding.html | 2 +-
 tests/app/main/views/test_email_branding.py                     | 2 ++
 tests/app/main/views/test_letter_branding.py                    | 2 ++
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/templates/views/email-branding/manage-branding.html b/app/templates/views/email-branding/manage-branding.html
index ca19c8f53..965ea3c81 100644
--- a/app/templates/views/email-branding/manage-branding.html
+++ b/app/templates/views/email-branding/manage-branding.html
@@ -24,7 +24,7 @@
       <p class="govuk-body">
         Logos should be PNG files, 108px high
       </p>
-      {{ file_upload(form.file, button_text='{} logo'.format('Update' if email_branding else 'Upload')) }}
+      {{ file_upload(form.file, allowed_file_extensions='.png', button_text='{} logo'.format('Update' if email_branding else 'Upload')) }}
       {% call form_wrapper() %}
         <div class="form-group">
           <div style='margin-top:15px;'>{{form.name}}</div>
diff --git a/app/templates/views/letter-branding/manage-letter-branding.html b/app/templates/views/letter-branding/manage-letter-branding.html
index 53e4ffa24..6903a740c 100644
--- a/app/templates/views/letter-branding/manage-letter-branding.html
+++ b/app/templates/views/letter-branding/manage-letter-branding.html
@@ -24,7 +24,7 @@
       <p class="govuk-body">
         Logos should be SVG files, cropped to artwork bounds and with all fonts outlined.
       </p>
-      {{ file_upload(file_upload_form.file, button_text='{} logo'.format('Update' if is_update else 'Upload')) }}
+      {{ file_upload(file_upload_form.file, allowed_file_extensions='.svg', button_text='{} logo'.format('Update' if is_update else 'Upload')) }}
       {% call form_wrapper() %}
         <div class="form-group">
           {{ letter_branding_details_form.name(param_extensions={
diff --git a/tests/app/main/views/test_email_branding.py b/tests/app/main/views/test_email_branding.py
index 787e108c2..126e95431 100644
--- a/tests/app/main/views/test_email_branding.py
+++ b/tests/app/main/views/test_email_branding.py
@@ -61,6 +61,7 @@ def test_edit_email_branding_shows_the_correct_branding_info(
 
     assert page.select_one('#logo-img > img')['src'].endswith('/example.png')
     assert page.select_one('#name').attrs.get('value') == 'Organisation name'
+    assert page.select_one('#file').attrs.get('accept') == '.png'
     assert page.select_one('#text').attrs.get('value') == 'Organisation text'
     assert page.select_one('#colour').attrs.get('value') == '#f00'
 
@@ -79,6 +80,7 @@ def test_create_email_branding_does_not_show_any_branding_info(
 
     assert page.select_one('#logo-img > img') is None
     assert page.select_one('#name').attrs.get('value') is None
+    assert page.select_one('#file').attrs.get('accept') == '.png'
     assert page.select_one('#text').attrs.get('value') is None
     assert page.select_one('#colour').attrs.get('value') is None
 
diff --git a/tests/app/main/views/test_letter_branding.py b/tests/app/main/views/test_letter_branding.py
index dd8e11fd8..a2bd8f992 100644
--- a/tests/app/main/views/test_letter_branding.py
+++ b/tests/app/main/views/test_letter_branding.py
@@ -62,6 +62,7 @@ def test_update_letter_branding_shows_the_current_letter_brand(
     assert page.find('h1').text == 'Update letter branding'
     assert page.select_one('#logo-img > img')['src'].endswith('/hm-government.svg')
     assert page.select_one('#name').attrs.get('value') == 'HM Government'
+    assert page.select_one('#file').attrs.get('accept') == '.svg'
 
 
 def test_update_letter_branding_with_new_valid_file(
@@ -312,6 +313,7 @@ def test_create_letter_branding_does_not_show_branding_info(platform_admin_clien
 
     assert page.select_one('#logo-img > img') is None
     assert page.select_one('#name').attrs.get('value') is None
+    assert page.select_one('#file').attrs.get('accept') == '.svg'
 
 
 def test_create_letter_branding_when_uploading_valid_file(