Fix tests

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 %>

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