diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb index 9f6afe1df..da5cb2fe7 100644 --- a/app/helpers/merge_requests_helper.rb +++ b/app/helpers/merge_requests_helper.rb @@ -14,7 +14,7 @@ module MergeRequestsHelper def merge_details(merge_request) [ { label: "Absorbing organisation", value: display_value_or_placeholder(merge_request.absorbing_organisation_name), action: merge_request.status == "request_merged" ? nil : { text: "Change", href: absorbing_organisation_merge_request_path(merge_request), visually_hidden_text: "absorbing organisation" } }, - { label: "Merging organisations", value: merge_request.merge_request_organisations.any? ? merge_request.merge_request_organisations.map(&:merging_organisation_name).join("
").html_safe : display_value_or_placeholder(nil), action: merge_request.status == "request_merged" ? nil : { text: "Change", href: organisations_merge_request_path(merge_request), visually_hidden_text: "merging organisations" } }, + { label: "Merging organisations", value: merge_request.merge_request_organisations.any? ? merge_request.merge_request_organisations.map(&:merging_organisation_name).join("
").html_safe : display_value_or_placeholder(nil), action: merge_request.status == "request_merged" ? nil : { text: "Change", href: merging_organisations_merge_request_path(merge_request), visually_hidden_text: "merging organisations" } }, { label: "Merge date", value: display_value_or_placeholder(merge_request.merge_date), action: merge_request.status == "request_merged" ? nil : { text: "Change", href: merge_date_merge_request_path(merge_request), visually_hidden_text: "merge date" } }, ] end diff --git a/spec/views/merge_requests/show.html.erb_spec.rb b/spec/views/merge_requests/show.html.erb_spec.rb index 0f0e42b2d..72974fc9e 100644 --- a/spec/views/merge_requests/show.html.erb_spec.rb +++ b/spec/views/merge_requests/show.html.erb_spec.rb @@ -46,15 +46,6 @@ RSpec.describe "merge_requests/show.html.erb", type: :view do expect(rendered).to have_selector("dd", text: merge_request.absorbing_organisation_name) end - it "displays the merging organisations details" do - expect(rendered).to have_selector("dt", text: "Merging organisations") - if merge_request.other_merging_organisations.present? - merge_request.other_merging_organisations.split(",").each do |organisation| - expect(rendered).to have_selector("dd", text: organisation.strip) - end - end - end - it "displays the merge date details" do expect(rendered).to have_selector("dt", text: "Merge date") expect(rendered).to have_selector("dd", text: merge_request.merge_date || "You didn't answer this question")