Browse Source

CLDC-2094++ Merge details page adjustments (#2593)

* Change page name and hide buttons during processing status

* Update test
pull/2620/head
Manny Dinssa 2 years ago committed by kosiakkatrina
parent
commit
61fa1dfd63
  1. 6
      app/views/merge_requests/show.html.erb
  2. 2
      spec/views/merge_requests/show.html.erb_spec.rb

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

@ -1,5 +1,5 @@
<% content_for :before_content do %>
<% title = "Merge details: #{@merge_request.absorbing_organisation_name}" %>
<% title = "Merge request: #{@merge_request.absorbing_organisation_name}" %>
<% content_for :title, title %>
<%= govuk_back_link href: organisations_path(tab: "merge-requests") %>
<% end %>
@ -7,10 +7,10 @@
<%= render partial: "notification_banners" %>
<h1 class="govuk-heading-l">
<span class="govuk-caption-l">Merge details</span>
<span class="govuk-caption-l">Merge request</span>
<%= display_value_or_placeholder(@merge_request.absorbing_organisation_name) %>
</h1>
<% unless @merge_request.status == "request_merged" %>
<% unless @merge_request.status == "request_merged" || @merge_request.status == "processing" %>
<div class="govuk-button-group">
<%= form_with model: @merge_request, url: start_merge_merge_request_path(@merge_request) do |f| %>
<%= f.govuk_submit "Begin merge", disabled: @merge_request.status != "ready_to_merge" %>

2
spec/views/merge_requests/show.html.erb_spec.rb

@ -12,7 +12,7 @@ RSpec.describe "merge_requests/show.html.erb", type: :view do
it "displays the correct title" do
expect(rendered).to have_selector("h1.govuk-heading-l") do |h1|
expect(h1).to have_selector("span.govuk-caption-l", text: "Merge details")
expect(h1).to have_selector("span.govuk-caption-l", text: "Merge request")
expect(h1).to have_content("Absorbing Org")
end
end

Loading…
Cancel
Save