diff --git a/app/controllers/merge_requests_controller.rb b/app/controllers/merge_requests_controller.rb index 6a0662b3d..d24779b3d 100644 --- a/app/controllers/merge_requests_controller.rb +++ b/app/controllers/merge_requests_controller.rb @@ -9,7 +9,6 @@ class MergeRequestsController < ApplicationController end def organisations - @merge_request = MergeRequest.find(params[:id]) @answer_options = organisations_answer_options end diff --git a/app/views/merge_requests/organisations.html.erb b/app/views/merge_requests/organisations.html.erb index aa5b5beb6..f2848c235 100644 --- a/app/views/merge_requests/organisations.html.erb +++ b/app/views/merge_requests/organisations.html.erb @@ -30,7 +30,7 @@ }) %> <% end %> <% end %> - <% @merge_request.merging_organisations&.each do |merging_organisation| %> + <% @merge_request.merging_organisations.each do |merging_organisation| %> <%= table.body do |body| %> <%= body.row do |row| %> <% row.cell(text: merging_organisation.name) %> @@ -46,7 +46,7 @@ <% end %> <% end %> <%= form_with model: @merge_request, url: merge_request_path(id: @merge_request.id), method: :patch do |f| %> - <%= govuk_details(summary_text: "Can't find the managing agent you're looking for?") do %> + <%= govuk_details(summary_text: "Can’t find the managing agent you’re looking for?") do %> <%= f.govuk_text_area :other_merging_organisations, label: { text: "Other organisations" }, hint: { text: "List other organisations that are part of the merge but not registered on CORE." }, rows: 9 %> <% end %> <%= f.govuk_submit "Continue" %> diff --git a/spec/requests/merge_requests_controller_spec.rb b/spec/requests/merge_requests_controller_spec.rb index cc7aa2893..ca8b0ec5f 100644 --- a/spec/requests/merge_requests_controller_spec.rb +++ b/spec/requests/merge_requests_controller_spec.rb @@ -2,7 +2,7 @@ require "rails_helper" RSpec.describe MergeRequestsController, type: :request do let(:organisation) { user.organisation } - let!(:other_organisation) { FactoryBot.create(:organisation, name: "Other Test Org") } + let(:other_organisation) { FactoryBot.create(:organisation, name: "Other Test Org") } let(:headers) { { "Accept" => "text/html" } } let(:page) { Capybara::Node::Simple.new(response.body) } let(:user) { FactoryBot.create(:user, :data_coordinator) }