From ac41a22329d5129f2e07d22f9c4a1f89b4362fcc Mon Sep 17 00:00:00 2001
From: Katie Smith <katie.smith@digital.cabinet-office.gov.uk>
Date: Thu, 30 Jan 2020 15:44:06 +0000
Subject: [PATCH] Use new button in banner macro

This means we can delete a class from the banner scss.
---
 app/assets/stylesheets/components/banner.scss | 5 -----
 app/templates/components/banner.html          | 7 ++++++-
 tests/app/main/views/test_template_folders.py | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/assets/stylesheets/components/banner.scss b/app/assets/stylesheets/components/banner.scss
index cd4e4504b..5a6266e4a 100644
--- a/app/assets/stylesheets/components/banner.scss
+++ b/app/assets/stylesheets/components/banner.scss
@@ -55,11 +55,6 @@
     outline: 3px solid $yellow;
   }
 
-  .button {
-    @include button($error-colour);
-    margin-top: 10px;
-  }
-
   a {
 
     &:link,
diff --git a/app/templates/components/banner.html b/app/templates/components/banner.html
index 1a272fa55..432292bc9 100644
--- a/app/templates/components/banner.html
+++ b/app/templates/components/banner.html
@@ -1,4 +1,5 @@
 {% from "components/form.html" import form_wrapper %}
+{% from "components/button/macro.njk" import govukButton %}
 
 {% macro banner(body, type=None, with_tick=False, delete_button=None, subhead=None, context=None, action=None, id=None) %}
   <div
@@ -23,7 +24,11 @@
     {% if delete_button %}
       {% call form_wrapper(action=action) %}
         <input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
-        <button type="submit" class="button" name="delete">{{ delete_button }}</button>
+        {{ govukButton({
+          "text": delete_button,
+          "name": "delete",
+          "classes": "govuk-button--warning govuk-!-margin-top-2",
+        }) }}
       {% endcall %}
     {% endif %}
   </div>
diff --git a/tests/app/main/views/test_template_folders.py b/tests/app/main/views/test_template_folders.py
index f61557879..1046c36b2 100644
--- a/tests/app/main/views/test_template_folders.py
+++ b/tests/app/main/views/test_template_folders.py
@@ -839,7 +839,7 @@ def test_delete_template_folder_should_request_confirmation(
     assert len(page.select('main button')) == 2
 
     assert 'action' not in page.select('main form')[0]
-    assert page.select('main form button')[0].text == 'Yes, delete'
+    assert normalize_spaces(page.select('main form button')[0].text) == 'Yes, delete'
 
     assert page.select('main form')[1]['action'] == url_for(
         'main.manage_template_folder',