diff --git a/app/views/organisations/show.html.erb b/app/views/organisations/show.html.erb index bbe9ae67a..4561e985b 100644 --- a/app/views/organisations/show.html.erb +++ b/app/views/organisations/show.html.erb @@ -35,6 +35,9 @@ <% end %> <% end %> + <% if FeatureToggle.merge_organisations_enabled? %> +

Is your organisation merging with another? <%= govuk_link_to "Let us know using this form", merge_organisation_path %>

+ <% end %>
diff --git a/config/initializers/feature_toggle.rb b/config/initializers/feature_toggle.rb index 125aa6770..9986af543 100644 --- a/config/initializers/feature_toggle.rb +++ b/config/initializers/feature_toggle.rb @@ -53,4 +53,8 @@ class FeatureToggle def self.collection_2023_2024_year_enabled? true end + + def self.merge_organisations_enabled? + !Rails.env.production? + end end diff --git a/config/routes.rb b/config/routes.rb index c01f38027..f6e00083b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -119,6 +119,7 @@ Rails.application.routes.draw do get "managing-agents/remove", to: "organisation_relationships#remove_managing_agent" post "managing-agents", to: "organisation_relationships#create_managing_agent" delete "managing-agents", to: "organisation_relationships#delete_managing_agent" + get "merge", to: "organisations#merge" end end diff --git a/spec/requests/organisations_controller_spec.rb b/spec/requests/organisations_controller_spec.rb index 15cfba390..c663f2e08 100644 --- a/spec/requests/organisations_controller_spec.rb +++ b/spec/requests/organisations_controller_spec.rb @@ -227,6 +227,11 @@ RSpec.describe OrganisationsController, type: :request do expected_html = "data-qa=\"change-name\" href=\"/organisations/#{organisation.id}/edit\"" expect(response.body).to include(expected_html) end + + it "displays a link to merge organisations" do + expect(page).to have_content("Is your organisation merging with another?") + expect(page).to have_link("Let us know using this form", href: "/organisations/#{organisation.id}/merge") + end end context "with organisation that are not in scope for the user, i.e. that they do not belong to" do