Browse Source

Fix lint offences

pull/2568/head
Manny Dinssa 2 years ago
parent
commit
1fbed4353b
  1. 2
      app/views/merge_requests/show.html.erb
  2. 2
      spec/models/merge_request_spec.rb

2
app/views/merge_requests/show.html.erb

@ -27,7 +27,7 @@
</h1> </h1>
<% unless @merge_request.status == "request_merged" %> <% unless @merge_request.status == "request_merged" %>
<div class="govuk-button-group"> <div class="govuk-button-group">
<%= 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 %> <%= govuk_button_link_to "Delete merge request", delete_confirmation_merge_request_path(@merge_request), warning: true %>
</div> </div>
<% end %> <% end %>

2
spec/models/merge_request_spec.rb

@ -26,9 +26,9 @@ RSpec.describe MergeRequest, type: :model do
describe "#discard!" do describe "#discard!" do
let(:merge_request) { create(:merge_request) } let(:merge_request) { create(:merge_request) }
let(:time) { Time.zone.now }
it "sets the discarded_at field to the current time" do it "sets the discarded_at field to the current time" do
let(:time) { Time.zone.now }
Timecop.freeze(time) do Timecop.freeze(time) do
merge_request.discard! merge_request.discard!
expect(merge_request.discarded_at).to eq(time) expect(merge_request.discarded_at).to eq(time)

Loading…
Cancel
Save