From 1fbed4353b3c776c7908f65d320d0a6c213a1ccb Mon Sep 17 00:00:00 2001 From: Manny Dinssa <44172848+Dinssa@users.noreply.github.com> Date: Tue, 13 Aug 2024 12:13:23 +0100 Subject: [PATCH] Fix lint offences --- app/views/merge_requests/show.html.erb | 2 +- spec/models/merge_request_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/merge_requests/show.html.erb b/app/views/merge_requests/show.html.erb index dc35f40ca..ce4fbb38d 100644 --- a/app/views/merge_requests/show.html.erb +++ b/app/views/merge_requests/show.html.erb @@ -27,7 +27,7 @@ <% unless @merge_request.status == "request_merged" %>
- <%= govuk_button_link_to "Begin merge", "#", 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 %>
<% end %> diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index 41031c840..46c508483 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -26,9 +26,9 @@ RSpec.describe MergeRequest, type: :model do describe "#discard!" do let(:merge_request) { create(:merge_request) } + let(:time) { Time.zone.now } it "sets the discarded_at field to the current time" do - let(:time) { Time.zone.now } Timecop.freeze(time) do merge_request.discard! expect(merge_request.discarded_at).to eq(time)