diff --git a/app/views/schemes/check_answers.html.erb b/app/views/schemes/check_answers.html.erb
index d286d2d52..bef9526fc 100644
--- a/app/views/schemes/check_answers.html.erb
+++ b/app/views/schemes/check_answers.html.erb
@@ -1,12 +1,5 @@
<% content_for :title, "Check your answers before creating this scheme" %>
-<% content_for :before_content do %>
- <%= govuk_back_link(
- text: "Back",
- href: "/schemes/#{@scheme.id}/support",
- ) %>
-<% end %>
-
<%= render partial: "organisations/headings", locals: { main: "Check your changes before updating this scheme", sub: @scheme.service_name } %>
<%= govuk_tabs(title: "Check your answers before creating this scheme") do |component| %>
diff --git a/app/views/schemes/support.html.erb b/app/views/schemes/support.html.erb
index a3f692c47..317b1d4f1 100644
--- a/app/views/schemes/support.html.erb
+++ b/app/views/schemes/support.html.erb
@@ -3,7 +3,7 @@
<% content_for :before_content do %>
<%= govuk_back_link(
text: "Back",
- href: "/schemes/#{@scheme.id}/secondary-client-group",
+ href: request.query_parameters["check_answers"] ? "/schemes/#{@scheme.id}/check-answers" : "/schemes/#{@scheme.id}/secondary-client-group",
) %>
<% end %>
diff --git a/spec/features/schemes_spec.rb b/spec/features/schemes_spec.rb
index 88594f369..ad8be1930 100644
--- a/spec/features/schemes_spec.rb
+++ b/spec/features/schemes_spec.rb
@@ -500,19 +500,35 @@ RSpec.describe "Schemes scheme Features" do
expect(page).to have_content "Check your changes before updating this scheme"
end
end
-
end
- it "allows changing support questions" do
- click_link("Change", href: "/schemes/#{scheme.id}/support?check_answers=true", match: :first)
- expect(page).to have_current_path("/schemes/#{scheme.id}/support?check_answers=true")
- choose "Resettlement support"
- choose "Medium stay"
- click_button "Save and continue"
+ context "changing support questions" do
+ before do
+ click_link("Change", href: "/schemes/#{scheme.id}/support?check_answers=true", match: :first)
+ end
+
+ it "allows changing support questions" do
+ expect(page).to have_current_path("/schemes/#{scheme.id}/support?check_answers=true")
+
+ choose "Resettlement support"
+ choose "Medium stay"
+ click_button "Save and continue"
- expect(page).to have_current_path("/schemes/#{scheme.id}/check-answers")
- expect(page).to have_content "Resettlement support"
- expect(page).to have_content "Medium stay"
+ expect(page).to have_current_path("/schemes/#{scheme.id}/check-answers")
+ expect(page).to have_content "Resettlement support"
+ expect(page).to have_content "Medium stay"
+ end
+
+ context "when I press the back button" do
+ before do
+ click_link "Back"
+ end
+
+ it "lets me select the support answers" do
+ expect(page).to have_current_path("/schemes/#{scheme.id}/check-answers")
+ expect(page).to have_content "Check your changes before updating this scheme"
+ end
+ end
end
end
end