From 7c13c29c38366bec8f94e57d7a3989e429ef0e80 Mon Sep 17 00:00:00 2001
From: Manny Dinssa <44172848+Dinssa@users.noreply.github.com>
Date: Tue, 13 Aug 2024 12:08:40 +0100
Subject: [PATCH] Fix tests

---
 app/views/merge_requests/show.html.erb | 2 +-
 spec/models/merge_request_spec.rb      | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/views/merge_requests/show.html.erb b/app/views/merge_requests/show.html.erb
index b0a8d0736..dc35f40ca 100644
--- a/app/views/merge_requests/show.html.erb
+++ b/app/views/merge_requests/show.html.erb
@@ -27,7 +27,7 @@
 </h1>
 <% unless @merge_request.status == "request_merged" %>
 <div class="govuk-button-group">
-  <%= govuk_button_link_to "Begin merge", nil, html: { method: :get }, disabled: !(@merge_request.status == "ready_to_merge") %>
+  <%= govuk_button_link_to "Begin merge", "#", disabled: !(@merge_request.status == "ready_to_merge") %>
   <%= govuk_button_link_to "Delete merge request", delete_confirmation_merge_request_path(@merge_request), warning: true %>
 </div>
 <% end %>
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index 10901623f..41031c840 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -28,9 +28,10 @@ RSpec.describe MergeRequest, type: :model do
     let(:merge_request) { create(:merge_request) }
 
     it "sets the discarded_at field to the current time" do
-      Timecop.freeze(Time.zone.now) do
+      let(:time) { Time.zone.now }
+      Timecop.freeze(time) do
         merge_request.discard!
-        expect(merge_request.discarded_at).to eq(Time.zone.now)
+        expect(merge_request.discarded_at).to eq(time)
       end
     end