<%= f.govuk_error_summary %>
@@ -23,7 +23,7 @@
<% if params[:referrer] == "check_answers" %>
<%= f.govuk_submit "Save changes" %>
- <%= govuk_button_link_to "Cancel", scheme_location_check_answers_path(@scheme, @location), secondary: true %>
+ <%= govuk_button_link_to "Cancel", scheme_location_check_answers_path(@scheme, @location, route: params[:route]), secondary: true %>
<% else %>
<%= f.govuk_submit "Save and continue" %>
<%= govuk_button_link_to "Cancel", scheme_locations_path(@scheme), secondary: true %>
diff --git a/app/views/schemes/check_answers.html.erb b/app/views/schemes/check_answers.html.erb
index 9f87ec566..806b8838a 100644
--- a/app/views/schemes/check_answers.html.erb
+++ b/app/views/schemes/check_answers.html.erb
@@ -33,53 +33,6 @@
<% end %>
<% end %>
- <% component.tab(label: "Locations") do %>
-
Locations
- <%= govuk_table do |table| %>
- <%= table.caption(classes: %w[govuk-!-font-size-19 govuk-!-font-weight-regular]) do |caption| %>
- <%= @scheme.locations.count %> <%= @scheme.locations.count.eql?(1) ? "location" : "locations" %>
- <% end %>
- <%= table.head do |head| %>
- <%= head.row do |row| %>
- <% row.cell(header: true, text: "Code", html_attributes: {
- scope: "col",
- }) %>
- <% row.cell(header: true, text: "Postcode", html_attributes: {
- scope: "col",
- }) %>
- <% row.cell(header: true, text: "Units", html_attributes: {
- scope: "col",
- }) %>
- <% row.cell(header: true, text: "Common unit type", html_attributes: {
- scope: "col",
- }) %>
- <% row.cell(header: true, text: "Mobility type", html_attributes: {
- scope: "col",
- }) %>
- <% row.cell(header: true, text: "Local authority", html_attributes: {
- scope: "col",
- }) %>
- <% row.cell(header: true, text: "Available from", html_attributes: {
- scope: "col",
- }) %>
- <% end %>
- <% end %>
- <% @scheme.locations.each do |location| %>
- <%= table.body do |body| %>
- <%= body.row do |row| %>
- <% row.cell(text: location.id) %>
- <% row.cell(text: simple_format(location_cell_postcode(location, get_location_change_link_href_postcode(@scheme, location)), { class: "govuk-!-font-weight-bold" }, wrapper_tag: "div")) %>
- <% row.cell(text: location.units) %>
- <% row.cell(text: simple_format("#{location.type_of_unit}")) %>
- <% row.cell(text: location.mobility_type) %>
- <% row.cell(text: simple_format(location_cell_location_admin_district(location, get_location_change_link_href_location_admin_district(@scheme, location)), wrapper_tag: "div")) %>
- <% row.cell(text: location_availability(location)) %>
- <% end %>
- <% end %>
- <% end %>
- <% end %>
- <%= govuk_button_link_to "Add a location", new_scheme_location_path(scheme_id: @scheme.id), secondary: true %>
- <% end %>
<% end %>
<%= f.hidden_field :page, value: "check-answers" %>
<%= f.hidden_field :confirmed, value: "true" %>
diff --git a/spec/features/schemes_spec.rb b/spec/features/schemes_spec.rb
index 8260cf538..85da73c1e 100644
--- a/spec/features/schemes_spec.rb
+++ b/spec/features/schemes_spec.rb
@@ -258,7 +258,7 @@ RSpec.describe "Schemes scheme Features" do
end
it "shows the new location form" do
- expect(page).to have_content("Add a location to this scheme")
+ expect(page).to have_content("Add a location to #{scheme.service_name}")
end
context "when the user completes the new location form" do
@@ -456,7 +456,7 @@ RSpec.describe "Schemes scheme Features" do
end
it "lets me add location" do
- expect(page).to have_content "Add a location to FooBar"
+ expect(page).to have_content "Add a location to #{scheme.service_name}"
end
it "lets me navigate back to support questions" do
@@ -817,7 +817,7 @@ RSpec.describe "Schemes scheme Features" do
assert_selector "a", text: "Change", count: 1
click_link("Change")
- expect(page).to have_content "Location name for #{location.postcode}"
+ expect(page).to have_content "What is the name of this location?"
end
it "allows to deactivate a location" do
@@ -843,7 +843,7 @@ RSpec.describe "Schemes scheme Features" do
it "returns to locations check your answers page and shows the new name" do
fill_in "location-name-field", with: "NewName"
- click_button "Save and continue"
+ click_button "Save changes"
expect(page).to have_content location.postcode
expect(page).to have_content "NewName"
expect(page).to have_current_path("/schemes/#{scheme.id}/locations/#{location.id}")
@@ -909,24 +909,32 @@ RSpec.describe "Schemes scheme Features" do
end
it "shows the new location form" do
- expect(page).to have_content("Add a location to this scheme")
+ expect(page).to have_content("Add a location to #{scheme.service_name}")
end
context "when the user completes the new location form" do
let(:location_name) { "Area 42" }
before do
- fill_in "Postcode", with: "NW1L 5DP"
- fill_in "Location name (optional)", with: location_name
- fill_in "Total number of units at this location", with: 1
+ fill_in with: "NW1L 5DP"
+ click_button "Save and continue"
+ fill_in with: location_name
+ click_button "Save and continue"
+ fill_in with: "Adur"
+ fill_in with: 1
+ click_button "Save and continue"
choose "Bungalow"
+ click_button "Save and continue"
choose "location-mobility-type-none-field"
- choose "location-add-another-location-no-field"
+ click_button "Save and continue"
+ fill_in "Day", with: 2
+ fill_in "Month", with: 2
+ fill_in "Year", with: 2022
click_button "Save and continue"
end
it "shows the check answers page location tab" do
- expect(page.current_url.split("/").last).to eq("check-answers#locations")
+ expect(page.current_url.split("/").last).to eq("check-answers")
expect(page).to have_content(location_name)
end