From 6e730b9a46b6c25dfad50e5f6fde476d164c5ec8 Mon Sep 17 00:00:00 2001
From: Jack S <jacopo.scotti@softwire.com>
Date: Fri, 12 May 2023 14:46:19 +0100
Subject: [PATCH] Use govuk_button_link_to

---
 app/views/logs/delete_confirmation.html.erb    | 5 +----
 app/views/logs/edit.html.erb                   | 4 +---
 db/schema.rb                                   | 4 ++--
 spec/requests/lettings_logs_controller_spec.rb | 2 +-
 spec/requests/sales_logs_controller_spec.rb    | 2 +-
 5 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/app/views/logs/delete_confirmation.html.erb b/app/views/logs/delete_confirmation.html.erb
index e92d25ec2..34105943f 100644
--- a/app/views/logs/delete_confirmation.html.erb
+++ b/app/views/logs/delete_confirmation.html.erb
@@ -16,14 +16,11 @@
       <%= govuk_button_to(
         "Delete this log",
         @log.lettings? ? lettings_log_path(@log) : sales_log_path(@log),
-        class: "govuk-!-margin-right-6",
         method: :delete
       ) %>
-      <%= govuk_button_to(
+      <%= govuk_button_link_to(
         "Cancel",
         @log.lettings? ? lettings_log_path(@log) : sales_log_path(@log),
-        button: true,
-        method: :get,
         secondary: true,
       ) %>
     </div>
diff --git a/app/views/logs/edit.html.erb b/app/views/logs/edit.html.erb
index c65af44ec..70777b357 100644
--- a/app/views/logs/edit.html.erb
+++ b/app/views/logs/edit.html.erb
@@ -53,11 +53,9 @@
     <% end %>
 
     <% if LogPolicy.new(current_user, @log).destroy? %>
-      <%= govuk_button_to(
+      <%= govuk_button_link_to(
         "Delete log",
         lettings_log_delete_confirmation_path(@log),
-        button: true,
-        method: :get,
         warning: true,
       ) %>
     <% end %>
diff --git a/db/schema.rb b/db/schema.rb
index a951c90a1..fee35ec37 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -584,6 +584,8 @@ ActiveRecord::Schema[7.0].define(version: 2023_05_05_105327) do
     t.integer "ethnicbuy2"
     t.integer "proplen_asked"
     t.string "old_id"
+    t.integer "buy2living"
+    t.integer "prevtenbuy2"
     t.integer "pregblank"
     t.string "uprn"
     t.integer "uprn_known"
@@ -592,8 +594,6 @@ ActiveRecord::Schema[7.0].define(version: 2023_05_05_105327) do
     t.string "address_line2"
     t.string "town_or_city"
     t.string "county"
-    t.integer "buy2living"
-    t.integer "prevtenbuy2"
     t.integer "nationalbuy2"
     t.integer "discounted_sale_value_check"
     t.integer "student_not_child_value_check"
diff --git a/spec/requests/lettings_logs_controller_spec.rb b/spec/requests/lettings_logs_controller_spec.rb
index f71dd4d03..b6afaeef0 100644
--- a/spec/requests/lettings_logs_controller_spec.rb
+++ b/spec/requests/lettings_logs_controller_spec.rb
@@ -1377,7 +1377,7 @@ RSpec.describe LettingsLogsController, type: :request do
 
         expect(page).to have_content("Are you sure you want to delete this log?")
         expect(page).to have_button(text: "Delete this log")
-        expect(page).to have_button(text: "Cancel")
+        expect(page).to have_link(text: "Cancel", href: lettings_log_path(id))
       end
     end
 
diff --git a/spec/requests/sales_logs_controller_spec.rb b/spec/requests/sales_logs_controller_spec.rb
index da2e5e1a6..fbf2219fe 100644
--- a/spec/requests/sales_logs_controller_spec.rb
+++ b/spec/requests/sales_logs_controller_spec.rb
@@ -722,7 +722,7 @@ RSpec.describe SalesLogsController, type: :request do
 
         expect(page).to have_content("Are you sure you want to delete this log?")
         expect(page).to have_button(text: "Delete this log")
-        expect(page).to have_button(text: "Cancel")
+        expect(page).to have_link(text: "Cancel", href: sales_log_path(id))
       end
     end