<% @scheme.check_details_attributes.each do |attr| %>
- <%= render partial: "scheme_summary_list_row", locals: { scheme: @scheme, attribute: attr, change_link: current_user.support? ? scheme_details_path(@scheme, check_answers: true) : scheme_edit_name_path(scheme_id: @scheme.id) } %>
+ <% if attr[:name] == "Status" %>
+
+
- Status
+ -
+ <%= details_html({ name: "Status", value: status_tag_from_resource(@scheme), id: "status" }) %>
+ <% if @scheme.confirmed? && @scheme.locations.confirmed.none? && LocationPolicy.new(current_user, @scheme.locations.new).create? %>
+ Complete this scheme by adding a location using the <%= govuk_link_to("‘locations’ tab", scheme_locations_path(@scheme)) %>.
+ <% end %>
+
+
+ <% else %>
+ <%= render partial: "scheme_summary_list_row", locals: { scheme: @scheme, attribute: attr, change_link: current_user.support? ? scheme_details_path(@scheme, check_answers: true) : scheme_edit_name_path(scheme_id: @scheme.id) } %>
+ <% end %>
<% end %>
<% @scheme.check_primary_client_attributes.each do |attr| %>
@@ -41,6 +53,13 @@
<% @scheme.check_support_attributes.each do |attr| %>
<%= render partial: "scheme_summary_list_row", locals: { scheme: @scheme, attribute: attr, change_link: scheme_support_path(@scheme, check_answers: true) } %>
<% end %>
+
+
+
- Availability
+ -
+ <%= details_html({ name: "Availability", value: scheme_availability(@scheme), id: "availability" }) %>
+
+
diff --git a/spec/features/schemes_spec.rb b/spec/features/schemes_spec.rb
index 242c40353..c2c84f94b 100644
--- a/spec/features/schemes_spec.rb
+++ b/spec/features/schemes_spec.rb
@@ -377,9 +377,9 @@ RSpec.describe "Schemes scheme Features" do
expect(page).to have_content("has been added")
end
- it "does not let you edit the saved location" do
+ it "lets you edit the saved location" do
click_link "AA1 2AA"
- expect(page).not_to have_link(nil, href: /postcode/)
+ expect(page).to have_link("Change", href: /postcode/)
end
end
@@ -607,7 +607,7 @@ RSpec.describe "Schemes scheme Features" do
it "displays changed location" do
click_link "AA1 2AA"
- click_link "Change"
+ click_link("Change", href: "/schemes/#{scheme.id}/locations/#{location.id}/name?referrer=details", match: :first)
fill_in with: "new name"
click_button "Save changes"
expect(page).to have_content "AA1 2AA"
@@ -864,10 +864,10 @@ RSpec.describe "Schemes scheme Features" do
expect(page).to have_content("Active")
end
- it "only allows to edit the location name" do
- assert_selector "a", text: "Change", count: 1
+ it "only allows to edit the location name, postcode, unit, unit type and mobility standards" do
+ assert_selector "a", text: "Change", count: 5
- click_link("Change")
+ click_link("Change", href: "/schemes/#{scheme.id}/locations/#{location.id}/name?referrer=details", match: :first)
expect(page).to have_content "What is the name of this location?"
end
@@ -889,7 +889,7 @@ RSpec.describe "Schemes scheme Features" do
context "and I change the location name" do
before do
- click_link("Change")
+ click_link("Change", href: "/schemes/#{scheme.id}/locations/#{location.id}/name?referrer=details", match: :first)
end
it "returns to locations check your answers page and shows the new name" do
@@ -1008,9 +1008,9 @@ RSpec.describe "Schemes scheme Features" do
expect(page).to have_content("has been added")
end
- it "does not let you edit the saved location" do
+ it "lets you edit the saved location" do
click_link "AA1 2AA"
- expect(page).not_to have_link(nil, href: /postcode/)
+ expect(page).to have_link("Change", href: /postcode/)
end
end
diff --git a/spec/requests/schemes_controller_spec.rb b/spec/requests/schemes_controller_spec.rb
index 0abeb92ae..6e00eb733 100644
--- a/spec/requests/schemes_controller_spec.rb
+++ b/spec/requests/schemes_controller_spec.rb
@@ -1832,12 +1832,9 @@ RSpec.describe SchemesController, type: :request do
get "/schemes/#{scheme.id}/primary-client-group"
end
- it "redirects to a view scheme page" do
- follow_redirect!
+ it "allows editing the primary client group" do
expect(response).to have_http_status(:ok)
- expect(path).to match("/schemes/#{scheme.id}")
- expect(page).to have_content(scheme.service_name)
- assert_select "a", text: /Change/, count: 3
+ expect(path).to match("/schemes/#{scheme.id}/primary-client-group")
end
end
end
@@ -1912,12 +1909,9 @@ RSpec.describe SchemesController, type: :request do
get "/schemes/#{scheme.id}/confirm-secondary-client-group"
end
- it "redirects to a view scheme page" do
- follow_redirect!
+ it "allows updating secondary client group" do
expect(response).to have_http_status(:ok)
- expect(path).to match("/schemes/#{scheme.id}")
- expect(page).to have_content(scheme.service_name)
- assert_select "a", text: /Change/, count: 3
+ expect(path).to match("/schemes/#{scheme.id}/confirm-secondary-client-group")
end
end
end
@@ -1992,12 +1986,9 @@ RSpec.describe SchemesController, type: :request do
get "/schemes/#{scheme.id}/secondary-client-group"
end
- it "redirects to a view scheme page" do
- follow_redirect!
+ it "allows editing secondary client group" do
expect(response).to have_http_status(:ok)
- expect(path).to match("/schemes/#{scheme.id}")
- expect(page).to have_content(scheme.service_name)
- assert_select "a", text: /Change/, count: 3
+ expect(path).to match("/schemes/#{scheme.id}/secondary-client-group")
end
end