From 61fa1dfd63a901957294126d08cf6683178195a3 Mon Sep 17 00:00:00 2001
From: Manny Dinssa <44172848+Dinssa@users.noreply.github.com>
Date: Mon, 19 Aug 2024 13:00:51 +0100
Subject: [PATCH] CLDC-2094++ Merge details page adjustments (#2593)

* Change page name and hide buttons during processing status

* Update test
---
 app/views/merge_requests/show.html.erb          | 6 +++---
 spec/views/merge_requests/show.html.erb_spec.rb | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/merge_requests/show.html.erb b/app/views/merge_requests/show.html.erb
index a211da034..26ad1dd23 100644
--- a/app/views/merge_requests/show.html.erb
+++ b/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" %>
diff --git a/spec/views/merge_requests/show.html.erb_spec.rb b/spec/views/merge_requests/show.html.erb_spec.rb
index 0e52e3f58..b6e6a3ce2 100644
--- a/spec/views/merge_requests/show.html.erb_spec.rb
+++ b/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