<%= govuk_summary_list do |summary_list| %>
<% @scheme.display_attributes.each do |attr| %>
- <%= summary_list.row do |row| %>
- <% row.key { attr[:name].to_s.humanize } %>
- <% row.value { details_html(attr) } %>
- <% end %>
+ <%= summary_list.row do |row| %>
+ <% row.key { attr[:name].eql?("Registered under Care Standards Act 2000") ? "Registered under Care Standards Act 2000" : attr[:name].to_s.humanize } %>
+ <% row.value { details_html(attr) } %>
<% end %>
+ <% end %>
<% end %>
diff --git a/config/routes.rb b/config/routes.rb
index 3e4492127..01efc2623 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -35,7 +35,11 @@ Rails.application.routes.draw do
get "edit/password", to: "users#edit_password"
end
- resources :schemes, path: "/supported-housing", only: %i[index show]
+ resources :schemes, only: %i[index show] do
+ member do
+ get "locations", to: "schemes#locations"
+ end
+ end
resources :users do
member do
@@ -50,7 +54,7 @@ Rails.application.routes.draw do
get "users", to: "organisations#users"
get "users/invite", to: "users/account#new"
get "logs", to: "organisations#logs"
- get "supported-housing", to: "organisations#schemes"
+ get "schemes", to: "organisations#schemes"
end
end
diff --git a/db/migrate/20220614124115_create_locations.rb b/db/migrate/20220614124115_create_locations.rb
new file mode 100644
index 000000000..e74ba019a
--- /dev/null
+++ b/db/migrate/20220614124115_create_locations.rb
@@ -0,0 +1,17 @@
+class CreateLocations < ActiveRecord::Migration[7.0]
+ def change
+ create_table :locations do |t|
+ t.string :location_code
+ t.string :postcode
+ t.string :type_of_unit
+ t.string :type_of_building
+ t.integer :wheelchair_adaptation
+ t.references :scheme, null: false, foreign_key: true
+ t.string :address_line1
+ t.string :address_line2
+ t.string :county
+
+ t.timestamps
+ end
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 6a4e5f2ea..d83363804 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema[7.0].define(version: 2022_06_13_094847) do
+ActiveRecord::Schema[7.0].define(version: 2022_06_14_124115) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -230,6 +230,21 @@ ActiveRecord::Schema[7.0].define(version: 2022_06_13_094847) do
t.index ["start_year", "lettype", "beds", "la"], name: "index_la_rent_ranges_on_start_year_and_lettype_and_beds_and_la", unique: true
end
+ create_table "locations", force: :cascade do |t|
+ t.string "location_code"
+ t.string "postcode"
+ t.string "type_of_unit"
+ t.string "type_of_building"
+ t.integer "wheelchair_adaptation"
+ t.bigint "scheme_id", null: false
+ t.string "address_line1"
+ t.string "address_line2"
+ t.string "county"
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ t.index ["scheme_id"], name: "index_locations_on_scheme_id"
+ end
+
create_table "logs_exports", force: :cascade do |t|
t.datetime "created_at", default: -> { "CURRENT_TIMESTAMP" }
t.datetime "started_at", null: false
@@ -347,5 +362,6 @@ ActiveRecord::Schema[7.0].define(version: 2022_06_13_094847) do
t.index ["item_type", "item_id"], name: "index_versions_on_item_type_and_item_id"
end
+ add_foreign_key "locations", "schemes"
add_foreign_key "schemes", "organisations"
end
diff --git a/db/seeds.rb b/db/seeds.rb
index ad1fc1ac4..fdf9d6172 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -70,7 +70,7 @@ unless Rails.env.test?
end
if Rails.env.development? && Scheme.count.zero?
- Scheme.create!(
+ scheme1 = Scheme.create!(
code: "S878",
service_name: "Beulahside Care",
sensitive: 0,
@@ -85,7 +85,7 @@ unless Rails.env.test?
created_at: Time.zone.now,
)
- Scheme.create!(
+ scheme2 = Scheme.create!(
code: "S312",
service_name: "Abdullahview Point",
sensitive: 0,
@@ -114,6 +114,42 @@ unless Rails.env.test?
organisation: dummy_org,
created_at: Time.zone.now,
)
+
+ Location.create!(
+ scheme: scheme1,
+ location_code: "S254-CU193AA",
+ postcode: "CU19 3AA",
+ address_line1: "Rectory Road",
+ address_line2: "North Chaim",
+ type_of_unit: "Self-contained flat or bedsit",
+ type_of_building: "Purpose-built",
+ county: "Mid Sussex",
+ wheelchair_adaptation: 0,
+ )
+
+ Location.create!(
+ scheme: scheme1,
+ location_code: "S254-DM250DC",
+ postcode: "DM25 0DC",
+ address_line1: "Smithy Lane",
+ address_line2: "North Kellieworth",
+ type_of_unit: "Self-contained flat or bedsit with common facilities",
+ type_of_building: "Converted from previous residential or non-residential property",
+ county: "Fife",
+ wheelchair_adaptation: 1,
+ )
+
+ Location.create!(
+ scheme: scheme2,
+ location_code: "S254-YX130WP",
+ postcode: "YX13 0WP",
+ address_line1: "Smithy Lane",
+ address_line2: "East Darwin",
+ type_of_unit: "Shared house or hostel",
+ type_of_building: "Converted from previous residential or non-residential property",
+ county: "Rochford",
+ wheelchair_adaptation: 1,
+ )
end
pp "Seeded 3 dummy schemes"
diff --git a/spec/components/primary_navigation_component_spec.rb b/spec/components/primary_navigation_component_spec.rb
index 9a3c91d09..dcab43c31 100644
--- a/spec/components/primary_navigation_component_spec.rb
+++ b/spec/components/primary_navigation_component_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe PrimaryNavigationComponent, type: :component do
NavigationItemsHelper::NavigationItem.new("Organisations", "/organisations", true),
NavigationItemsHelper::NavigationItem.new("Users", "/users", false),
NavigationItemsHelper::NavigationItem.new("Logs ", "/logs", false),
- NavigationItemsHelper::NavigationItem.new("Supported housing", "/supported-housing", false),
+ NavigationItemsHelper::NavigationItem.new("Schemes", "/schemes", false),
]
end
@@ -36,7 +36,7 @@ RSpec.describe PrimaryNavigationComponent, type: :component do
expect(result.text).to include("Organisations")
expect(result.text).to include("Users")
expect(result.text).to include("Logs")
- expect(result.text).to include("Supported housing")
+ expect(result.text).to include("Schemes")
end
end
@@ -45,9 +45,9 @@ RSpec.describe PrimaryNavigationComponent, type: :component do
allow(Rails.env).to receive(:production?).and_return(true)
end
- it "doesn't render supported housing" do
+ it "doesn't render schemes" do
result = render_inline(described_class.new(items:))
- expect(result.text).not_to include("Supported housing")
+ expect(result.text).not_to include("Schemes")
end
end
end
diff --git a/spec/factories/location.rb b/spec/factories/location.rb
new file mode 100644
index 000000000..7afaeb11c
--- /dev/null
+++ b/spec/factories/location.rb
@@ -0,0 +1,13 @@
+FactoryBot.define do
+ factory :location do
+ location_code { Faker::Name.initials(number: 10) }
+ postcode { Faker::Address.postcode }
+ address_line1 { Faker::Address.street_name }
+ address_line2 { Faker::Address.city }
+ type_of_unit { Faker::Lorem.word }
+ type_of_building { Faker::Lorem.word }
+ wheelchair_adaptation { 0 }
+ county { Faker::Address.state }
+ scheme
+ end
+end
diff --git a/spec/factories/scheme.rb b/spec/factories/scheme.rb
index 6c3537146..d4f2c1cfb 100644
--- a/spec/factories/scheme.rb
+++ b/spec/factories/scheme.rb
@@ -1,7 +1,7 @@
FactoryBot.define do
factory :scheme do
code { Faker::Name.initials(number: 4) }
- service_name { Faker::Name.name_with_middle }
+ service_name { Faker::Name.name }
sensitive { Faker::Number.within(range: 0..1) }
registered_under_care_act { Faker::Number.within(range: 0..1) }
support_type { Faker::Number.within(range: 0..6) }
diff --git a/spec/features/schemes_spec.rb b/spec/features/schemes_spec.rb
index f772a24c8..46ee351e0 100644
--- a/spec/features/schemes_spec.rb
+++ b/spec/features/schemes_spec.rb
@@ -1,6 +1,6 @@
require "rails_helper"
-RSpec.describe "Supported housing scheme Features" do
+RSpec.describe "Schemes scheme Features" do
context "when viewing list of schemes" do
context "when I am signed as a support user and there are schemes in the database" do
let(:user) { FactoryBot.create(:user, :support, last_sign_in_at: Time.zone.now) }
@@ -25,13 +25,13 @@ RSpec.describe "Supported housing scheme Features" do
click_button("Submit")
end
- it "displays the link to the supported housing" do
- expect(page).to have_link("Supported housing", href: "/supported-housing")
+ it "displays the link to the schemes" do
+ expect(page).to have_link("Schemes", href: "/schemes")
end
- context "when I click Supported housing" do
+ context "when I click schemes" do
before do
- click_link "Supported housing", href: "/supported-housing"
+ click_link "Schemes", href: "/schemes"
end
it "shows list of schemes" do
@@ -99,9 +99,9 @@ RSpec.describe "Supported housing scheme Features" do
click_button("Submit")
end
- context "when I visit supported housing page" do
+ context "when I visit schemes page" do
before do
- visit("supported-housing")
+ visit("schemes")
end
it "shows list of links to schemes" do
@@ -112,8 +112,10 @@ RSpec.describe "Supported housing scheme Features" do
end
context "when I click to see individual scheme" do
+ let(:scheme) { schemes.first }
+
before do
- click_link(schemes.first.service_name)
+ click_link(scheme.service_name)
end
it "shows me details about the selected scheme" do
@@ -128,6 +130,49 @@ RSpec.describe "Supported housing scheme Features" do
expect(page).to have_content(schemes.first.support_type_display)
expect(page).to have_content(schemes.first.intended_stay_display)
end
+
+ context "when I click to go back" do
+ before do
+ visit("schemes")
+ click_link(scheme.service_name)
+ end
+
+ it "shows list of links to schemes" do
+ click_on("Back")
+ schemes.each do |scheme|
+ expect(page).to have_link(scheme.service_name)
+ expect(page).to have_content(scheme.primary_client_group_display)
+ end
+ end
+ end
+
+ context "when there are locations that belong to the selected scheme" do
+ let!(:schemes) { FactoryBot.create_list(:scheme, 5) }
+ let(:scheme) { schemes.first }
+ let!(:locations) { FactoryBot.create_list(:location, 3, scheme:) }
+
+ before do
+ visit("schemes")
+ click_link(scheme.service_name)
+ end
+
+ it "shows service and locations tab" do
+ expect(page).to have_link("Scheme")
+ expect(page).to have_link("#{scheme.locations.count} locations")
+ end
+
+ context "when I click locations link" do
+ before do
+ click_link("#{scheme.locations.count} locations")
+ end
+
+ it "shows details of those locations" do
+ locations.each do |location|
+ expect(page).to have_content(location.location_code)
+ end
+ end
+ end
+ end
end
end
end
diff --git a/spec/helpers/navigation_items_helper_spec.rb b/spec/helpers/navigation_items_helper_spec.rb
index 52ad582c5..90a96017b 100644
--- a/spec/helpers/navigation_items_helper_spec.rb
+++ b/spec/helpers/navigation_items_helper_spec.rb
@@ -12,7 +12,7 @@ RSpec.describe NavigationItemsHelper do
let(:expected_navigation_items) do
[
NavigationItemsHelper::NavigationItem.new("Logs", "/logs", true),
- NavigationItemsHelper::NavigationItem.new("Supported housing", "/supported-housing", false),
+ NavigationItemsHelper::NavigationItem.new("Schemes", "/schemes", false),
NavigationItemsHelper::NavigationItem.new("Users", users_path, false),
NavigationItemsHelper::NavigationItem.new("About your organisation", organisation_path, false),
]
@@ -27,7 +27,7 @@ RSpec.describe NavigationItemsHelper do
let(:expected_navigation_items) do
[
NavigationItemsHelper::NavigationItem.new("Logs", "/logs", false),
- NavigationItemsHelper::NavigationItem.new("Supported housing", "/supported-housing", false),
+ NavigationItemsHelper::NavigationItem.new("Schemes", "/schemes", false),
NavigationItemsHelper::NavigationItem.new("Users", users_path, true),
NavigationItemsHelper::NavigationItem.new("About your organisation", organisation_path, false),
]
@@ -42,7 +42,7 @@ RSpec.describe NavigationItemsHelper do
let(:expected_navigation_items) do
[
NavigationItemsHelper::NavigationItem.new("Logs", "/logs", false),
- NavigationItemsHelper::NavigationItem.new("Supported housing", "/supported-housing", false),
+ NavigationItemsHelper::NavigationItem.new("Schemes", "/schemes", false),
NavigationItemsHelper::NavigationItem.new("Users", users_path, false),
NavigationItemsHelper::NavigationItem.new("About your organisation", organisation_path, true),
]
@@ -57,7 +57,7 @@ RSpec.describe NavigationItemsHelper do
let(:expected_navigation_items) do
[
NavigationItemsHelper::NavigationItem.new("Logs", "/logs", false),
- NavigationItemsHelper::NavigationItem.new("Supported housing", "/supported-housing", false),
+ NavigationItemsHelper::NavigationItem.new("Schemes", "/schemes", false),
NavigationItemsHelper::NavigationItem.new("Users", "/organisations/#{current_user.organisation.id}/users", false),
NavigationItemsHelper::NavigationItem.new("About your organisation", organisation_path, false),
]
@@ -72,7 +72,7 @@ RSpec.describe NavigationItemsHelper do
let(:expected_navigation_items) do
[
NavigationItemsHelper::NavigationItem.new("Logs", "/logs", false),
- NavigationItemsHelper::NavigationItem.new("Supported housing", "/supported-housing", false),
+ NavigationItemsHelper::NavigationItem.new("Schemes", "/schemes", false),
NavigationItemsHelper::NavigationItem.new("Users", "/organisations/#{current_user.organisation.id}/users", true),
NavigationItemsHelper::NavigationItem.new("About your organisation", organisation_path, false),
]
@@ -87,14 +87,14 @@ RSpec.describe NavigationItemsHelper do
let(:expected_navigation_items) do
[
NavigationItemsHelper::NavigationItem.new("Logs", "/logs", false),
- NavigationItemsHelper::NavigationItem.new("Supported housing", "/supported-housing", true),
+ NavigationItemsHelper::NavigationItem.new("Schemes", "/schemes", true),
NavigationItemsHelper::NavigationItem.new("Users", "/organisations/#{current_user.organisation.id}/users", false),
NavigationItemsHelper::NavigationItem.new("About your organisation", organisation_path, false),
]
end
- it "returns navigation items with supported housing item set as current" do
- expect(primary_items("/supported-housing/1", current_user)).to eq(expected_navigation_items)
+ it "returns navigation items with Schemes item set as current" do
+ expect(primary_items("/schemes/1", current_user)).to eq(expected_navigation_items)
end
end
end
@@ -108,7 +108,7 @@ RSpec.describe NavigationItemsHelper do
NavigationItemsHelper::NavigationItem.new("Organisations", "/organisations", false),
NavigationItemsHelper::NavigationItem.new("Users", "/users", false),
NavigationItemsHelper::NavigationItem.new("Logs", "/logs", true),
- NavigationItemsHelper::NavigationItem.new("Supported housing", "/supported-housing", false),
+ NavigationItemsHelper::NavigationItem.new("Schemes", "/schemes", false),
]
end
@@ -123,7 +123,7 @@ RSpec.describe NavigationItemsHelper do
NavigationItemsHelper::NavigationItem.new("Organisations", "/organisations", false),
NavigationItemsHelper::NavigationItem.new("Users", "/users", true),
NavigationItemsHelper::NavigationItem.new("Logs", "/logs", false),
- NavigationItemsHelper::NavigationItem.new("Supported housing", "/supported-housing", false),
+ NavigationItemsHelper::NavigationItem.new("Schemes", "/schemes", false),
]
end
@@ -138,7 +138,7 @@ RSpec.describe NavigationItemsHelper do
NavigationItemsHelper::NavigationItem.new("Organisations", "/organisations", false),
NavigationItemsHelper::NavigationItem.new("Users", "/users", false),
NavigationItemsHelper::NavigationItem.new("Logs", "/logs", false),
- NavigationItemsHelper::NavigationItem.new("Supported housing", "/supported-housing", false),
+ NavigationItemsHelper::NavigationItem.new("Schemes", "/schemes", false),
]
end
@@ -147,18 +147,18 @@ RSpec.describe NavigationItemsHelper do
end
end
- context "when the user is on the supported housing page" do
+ context "when the user is on the Schemes page" do
let(:expected_navigation_items) do
[
NavigationItemsHelper::NavigationItem.new("Organisations", "/organisations", false),
NavigationItemsHelper::NavigationItem.new("Users", "/users", false),
NavigationItemsHelper::NavigationItem.new("Logs", "/logs", false),
- NavigationItemsHelper::NavigationItem.new("Supported housing", "/supported-housing", true),
+ NavigationItemsHelper::NavigationItem.new("Schemes", "/schemes", true),
]
end
it "returns navigation items with the users item set as current" do
- expect(primary_items("/supported-housing", current_user)).to eq(expected_navigation_items)
+ expect(primary_items("/schemes", current_user)).to eq(expected_navigation_items)
end
end
@@ -168,7 +168,7 @@ RSpec.describe NavigationItemsHelper do
NavigationItemsHelper::NavigationItem.new("Organisations", "/organisations", false),
NavigationItemsHelper::NavigationItem.new("Users", "/users", true),
NavigationItemsHelper::NavigationItem.new("Logs", "/logs", false),
- NavigationItemsHelper::NavigationItem.new("Supported housing", "/supported-housing", false),
+ NavigationItemsHelper::NavigationItem.new("Schemes", "/schemes", false),
]
end
@@ -183,12 +183,43 @@ RSpec.describe NavigationItemsHelper do
NavigationItemsHelper::NavigationItem.new("Organisations", "/organisations", false),
NavigationItemsHelper::NavigationItem.new("Users", "/users", false),
NavigationItemsHelper::NavigationItem.new("Logs", "/logs", false),
- NavigationItemsHelper::NavigationItem.new("Supported housing", "/supported-housing", true),
+ NavigationItemsHelper::NavigationItem.new("Schemes", "/schemes", true),
]
end
- it "returns navigation items with supported housing item set as current" do
- expect(primary_items("/supported-housing/1", current_user)).to eq(expected_navigation_items)
+ let(:expected_scheme_items) do
+ [
+ NavigationItemsHelper::NavigationItem.new("Scheme", "/schemes/1", true),
+ NavigationItemsHelper::NavigationItem.new("1 location", "/schemes/1/locations", false),
+ ]
+ end
+
+ it "returns navigation items with Schemes item set as current" do
+ expect(primary_items("/schemes/1", current_user)).to eq(expected_navigation_items)
+ expect(scheme_items("/schemes/1", 1, "1 location")).to eq(expected_scheme_items)
+ end
+ end
+
+ context "when the user is on the scheme locations page" do
+ let(:expected_navigation_items) do
+ [
+ NavigationItemsHelper::NavigationItem.new("Organisations", "/organisations", false),
+ NavigationItemsHelper::NavigationItem.new("Users", "/users", false),
+ NavigationItemsHelper::NavigationItem.new("Logs", "/logs", false),
+ NavigationItemsHelper::NavigationItem.new("Schemes", "/schemes", true),
+ ]
+ end
+
+ let(:expected_scheme_items) do
+ [
+ NavigationItemsHelper::NavigationItem.new("Scheme", "/schemes/1", false),
+ NavigationItemsHelper::NavigationItem.new("1 location", "/schemes/1/locations", true),
+ ]
+ end
+
+ it "returns navigation items with Schemes item set as current" do
+ expect(primary_items("/schemes/1/locations", current_user)).to eq(expected_navigation_items)
+ expect(scheme_items("/schemes/1/locations", 1, "1 location")).to eq(expected_scheme_items)
end
end
@@ -200,14 +231,14 @@ RSpec.describe NavigationItemsHelper do
NavigationItemsHelper::NavigationItem.new("Organisations", "/organisations", true),
NavigationItemsHelper::NavigationItem.new("Users", "/users", false),
NavigationItemsHelper::NavigationItem.new("Logs", "/logs", false),
- NavigationItemsHelper::NavigationItem.new("Supported housing", "/supported-housing", false),
+ NavigationItemsHelper::NavigationItem.new("Schemes", "/schemes", false),
]
end
let(:expected_secondary_navigation_items) do
[
NavigationItemsHelper::NavigationItem.new("Logs", "/organisations/#{current_user.organisation.id}/logs", true),
- NavigationItemsHelper::NavigationItem.new("Supported housing", "/organisations/#{current_user.organisation.id}/supported-housing", false),
+ NavigationItemsHelper::NavigationItem.new("Schemes", "/organisations/#{current_user.organisation.id}/schemes", false),
NavigationItemsHelper::NavigationItem.new("Users", "/organisations/#{current_user.organisation.id}/users", false),
NavigationItemsHelper::NavigationItem.new("About this organisation", "/organisations/#{current_user.organisation.id}", false),
]
@@ -226,14 +257,14 @@ RSpec.describe NavigationItemsHelper do
NavigationItemsHelper::NavigationItem.new("Organisations", "/organisations", true),
NavigationItemsHelper::NavigationItem.new("Users", "/users", false),
NavigationItemsHelper::NavigationItem.new("Logs", "/logs", false),
- NavigationItemsHelper::NavigationItem.new("Supported housing", "/supported-housing", false),
+ NavigationItemsHelper::NavigationItem.new("Schemes", "/schemes", false),
]
end
let(:expected_secondary_navigation_items) do
[
NavigationItemsHelper::NavigationItem.new("Logs", "/organisations/#{current_user.organisation.id}/logs", false),
- NavigationItemsHelper::NavigationItem.new("Supported housing", "/organisations/#{current_user.organisation.id}/supported-housing", false),
+ NavigationItemsHelper::NavigationItem.new("Schemes", "/organisations/#{current_user.organisation.id}/schemes", false),
NavigationItemsHelper::NavigationItem.new("Users", "/organisations/#{current_user.organisation.id}/users", true),
NavigationItemsHelper::NavigationItem.new("About this organisation", "/organisations/#{current_user.organisation.id}", false),
]
@@ -246,20 +277,20 @@ RSpec.describe NavigationItemsHelper do
end
context "when the user is on organisation schemes page" do
- let(:required_sub_path) { "supported-housing" }
+ let(:required_sub_path) { "schemes" }
let(:expected_navigation_items) do
[
NavigationItemsHelper::NavigationItem.new("Organisations", "/organisations", true),
NavigationItemsHelper::NavigationItem.new("Users", "/users", false),
NavigationItemsHelper::NavigationItem.new("Logs", "/logs", false),
- NavigationItemsHelper::NavigationItem.new("Supported housing", "/supported-housing", false),
+ NavigationItemsHelper::NavigationItem.new("Schemes", "/schemes", false),
]
end
let(:expected_secondary_navigation_items) do
[
NavigationItemsHelper::NavigationItem.new("Logs", "/organisations/#{current_user.organisation.id}/logs", false),
- NavigationItemsHelper::NavigationItem.new("Supported housing", "/organisations/#{current_user.organisation.id}/supported-housing", true),
+ NavigationItemsHelper::NavigationItem.new("Schemes", "/organisations/#{current_user.organisation.id}/schemes", true),
NavigationItemsHelper::NavigationItem.new("Users", "/organisations/#{current_user.organisation.id}/users", false),
NavigationItemsHelper::NavigationItem.new("About this organisation", "/organisations/#{current_user.organisation.id}", false),
]
@@ -278,14 +309,14 @@ RSpec.describe NavigationItemsHelper do
NavigationItemsHelper::NavigationItem.new("Organisations", "/organisations", true),
NavigationItemsHelper::NavigationItem.new("Users", "/users", false),
NavigationItemsHelper::NavigationItem.new("Logs", "/logs", false),
- NavigationItemsHelper::NavigationItem.new("Supported housing", "/supported-housing", false),
+ NavigationItemsHelper::NavigationItem.new("Schemes", "/schemes", false),
]
end
let(:expected_secondary_navigation_items) do
[
NavigationItemsHelper::NavigationItem.new("Logs", "/organisations/#{current_user.organisation.id}/logs", false),
- NavigationItemsHelper::NavigationItem.new("Supported housing", "/organisations/#{current_user.organisation.id}/supported-housing", false),
+ NavigationItemsHelper::NavigationItem.new("Schemes", "/organisations/#{current_user.organisation.id}/schemes", false),
NavigationItemsHelper::NavigationItem.new("Users", "/organisations/#{current_user.organisation.id}/users", false),
NavigationItemsHelper::NavigationItem.new("About this organisation", "/organisations/#{current_user.organisation.id}", true),
]
diff --git a/spec/helpers/tab_nav_helper_spec.rb b/spec/helpers/tab_nav_helper_spec.rb
index 59d4170b7..7ec36f974 100644
--- a/spec/helpers/tab_nav_helper_spec.rb
+++ b/spec/helpers/tab_nav_helper_spec.rb
@@ -21,7 +21,7 @@ RSpec.describe TabNavHelper do
describe "#scheme_cell" do
it "returns the scheme link service name and primary user group separated by a newline character" do
- expected_html = "#{scheme.service_name}\nScheme #{scheme.primary_client_group_display}"
+ expected_html = "#{scheme.service_name}\nScheme #{scheme.primary_client_group_display}"
expect(scheme_cell(scheme)).to match(expected_html)
end
end
diff --git a/spec/requests/organisations_controller_spec.rb b/spec/requests/organisations_controller_spec.rb
index cd976453d..9179ec3b3 100644
--- a/spec/requests/organisations_controller_spec.rb
+++ b/spec/requests/organisations_controller_spec.rb
@@ -31,8 +31,8 @@ RSpec.describe OrganisationsController, type: :request do
expect(response).to redirect_to("/account/sign-in")
end
- it "does not let you see supported housing list" do
- get "/organisations/#{organisation.id}/supported-housing", headers: headers, params: {}
+ it "does not let you see schemes list" do
+ get "/organisations/#{organisation.id}/schemes", headers: headers, params: {}
expect(response).to redirect_to("/account/sign-in")
end
end
@@ -48,11 +48,11 @@ RSpec.describe OrganisationsController, type: :request do
before do
allow(user).to receive(:need_two_factor_authentication?).and_return(false)
sign_in user
- get "/organisations/#{organisation.id}/supported-housing", headers:, params: {}
+ get "/organisations/#{organisation.id}/schemes", headers:, params: {}
end
it "has page heading" do
- expect(page).to have_content("Supported housing services")
+ expect(page).to have_content("Schemes")
end
it "shows a search bar" do
@@ -60,7 +60,7 @@ RSpec.describe OrganisationsController, type: :request do
end
it "has hidden accebility field with description" do
- expected_field = "
Supported housing services
"
+ expected_field = "
Supported housing schemes
"
expect(CGI.unescape_html(response.body)).to include(expected_field)
end
@@ -77,7 +77,7 @@ RSpec.describe OrganisationsController, type: :request do
before do
allow(user).to receive(:need_two_factor_authentication?).and_return(false)
- get "/organisations/#{organisation.id}/supported-housing?search=#{search_param}"
+ get "/organisations/#{organisation.id}/schemes?search=#{search_param}"
end
it "returns matching results" do
@@ -104,19 +104,19 @@ RSpec.describe OrganisationsController, type: :request do
before do
sign_in user
- get "/organisations/#{organisation.id}/supported-housing", headers:, params: {}
+ get "/organisations/#{organisation.id}/schemes", headers:, params: {}
end
it "has page heading" do
- expect(page).to have_content("Supported housing services")
+ expect(page).to have_content("Schemes")
end
it "shows a search bar" do
expect(page).to have_field("search", type: "search")
end
- it "has hidden accebility field with description" do
- expected_field = "
Supported housing services
"
+ it "has hidden accessibility field with description" do
+ expected_field = "
Supported housing schemes
"
expect(CGI.unescape_html(response.body)).to include(expected_field)
end
@@ -131,7 +131,7 @@ RSpec.describe OrganisationsController, type: :request do
let!(:unauthorised_organisation) { FactoryBot.create(:organisation) }
before do
- get "/organisations/#{unauthorised_organisation.id}/supported-housing", headers:, params: {}
+ get "/organisations/#{unauthorised_organisation.id}/schemes", headers:, params: {}
end
it "returns not found 404 from org details route" do
@@ -144,7 +144,7 @@ RSpec.describe OrganisationsController, type: :request do
let(:search_param) { "CODE321" }
before do
- get "/organisations/#{organisation.id}/supported-housing?search=#{search_param}"
+ get "/organisations/#{organisation.id}/schemes?search=#{search_param}"
end
it "returns matching results" do
@@ -159,7 +159,7 @@ RSpec.describe OrganisationsController, type: :request do
end
it "has search in the title" do
- expect(page).to have_title("Supported housing services (1 scheme matching ‘#{search_param}’) - Submit social housing lettings and sales data (CORE) - GOV.UK")
+ expect(page).to have_title("Supported housing schemes (1 scheme matching ‘#{search_param}’) - Submit social housing lettings and sales data (CORE) - GOV.UK")
end
end
end
diff --git a/spec/requests/schemes_controller_spec.rb b/spec/requests/schemes_controller_spec.rb
index 4d5c248d5..a7d907573 100644
--- a/spec/requests/schemes_controller_spec.rb
+++ b/spec/requests/schemes_controller_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe SchemesController, type: :request do
describe "#index" do
context "when not signed in" do
it "redirects to the sign in page" do
- get "/supported-housing"
+ get "/schemes"
expect(response).to redirect_to("/account/sign-in")
end
end
@@ -20,7 +20,7 @@ RSpec.describe SchemesController, type: :request do
before do
sign_in user
- get "/supported-housing"
+ get "/schemes"
end
it "returns 401 unauthorized" do
@@ -34,12 +34,12 @@ RSpec.describe SchemesController, type: :request do
before do
sign_in user
- get "/supported-housing"
+ get "/schemes"
end
it "redirects to the organisation schemes path" do
follow_redirect!
- expect(path).to match("/organisations/#{user.organisation.id}/supported-housing")
+ expect(path).to match("/organisations/#{user.organisation.id}/schemes")
end
end
@@ -47,11 +47,11 @@ RSpec.describe SchemesController, type: :request do
before do
allow(user).to receive(:need_two_factor_authentication?).and_return(false)
sign_in user
- get "/supported-housing"
+ get "/schemes"
end
it "has page heading" do
- expect(page).to have_content("Supported housing services")
+ expect(page).to have_content("Schemes")
end
it "shows all schemes" do
@@ -65,7 +65,7 @@ RSpec.describe SchemesController, type: :request do
end
it "has correct title" do
- expect(page).to have_title("Supported housing services - Submit social housing lettings and sales data (CORE) - GOV.UK")
+ expect(page).to have_title("Supported housing schemes - Submit social housing lettings and sales data (CORE) - GOV.UK")
end
it "shows the total organisations count" do
@@ -73,7 +73,7 @@ RSpec.describe SchemesController, type: :request do
end
it "has hidden accebility field with description" do
- expected_field = "
Supported housing services
"
+ expected_field = "
Supported housing schemes
"
expect(CGI.unescape_html(response.body)).to include(expected_field)
end
@@ -86,7 +86,7 @@ RSpec.describe SchemesController, type: :request do
context "when on the first page" do
before do
- get "/supported-housing"
+ get "/schemes"
end
it "shows the total schemes count" do
@@ -98,7 +98,7 @@ RSpec.describe SchemesController, type: :request do
end
it "has correct page 1 of 2 title" do
- expect(page).to have_title("Supported housing services (page 1 of 2) - Submit social housing lettings and sales data (CORE) - GOV.UK")
+ expect(page).to have_title("Supported housing schemes (page 1 of 2) - Submit social housing lettings and sales data (CORE) - GOV.UK")
end
it "has pagination links" do
@@ -111,7 +111,7 @@ RSpec.describe SchemesController, type: :request do
context "when on the second page" do
before do
- get "/supported-housing?page=2"
+ get "/schemes?page=2"
end
it "shows the total schemes count" do
@@ -130,7 +130,7 @@ RSpec.describe SchemesController, type: :request do
end
it "has correct page 1 of 2 title" do
- expect(page).to have_title("Supported housing services (page 2 of 2) - Submit social housing lettings and sales data (CORE) - GOV.UK")
+ expect(page).to have_title("Supported housing schemes (page 2 of 2) - Submit social housing lettings and sales data (CORE) - GOV.UK")
end
end
end
@@ -140,7 +140,7 @@ RSpec.describe SchemesController, type: :request do
let(:search_param) { "CODE321" }
before do
- get "/supported-housing?search=#{search_param}"
+ get "/schemes?search=#{search_param}"
end
it "returns matching results" do
@@ -155,7 +155,7 @@ RSpec.describe SchemesController, type: :request do
end
it "has search in the title" do
- expect(page).to have_title("Supported housing services (1 scheme matching ‘#{search_param}’) - Submit social housing lettings and sales data (CORE) - GOV.UK")
+ expect(page).to have_title("Supported housing schemes (1 scheme matching ‘#{search_param}’) - Submit social housing lettings and sales data (CORE) - GOV.UK")
end
end
end
@@ -166,7 +166,7 @@ RSpec.describe SchemesController, type: :request do
context "when not signed in" do
it "redirects to the sign in page" do
- get "/supported-housing/#{specific_scheme.id}"
+ get "/schemes/#{specific_scheme.id}"
expect(response).to redirect_to("/account/sign-in")
end
end
@@ -176,7 +176,7 @@ RSpec.describe SchemesController, type: :request do
before do
sign_in user
- get "/supported-housing/#{specific_scheme.id}"
+ get "/schemes/#{specific_scheme.id}"
end
it "returns 401 unauthorized" do
@@ -194,7 +194,7 @@ RSpec.describe SchemesController, type: :request do
end
it "has page heading" do
- get "/supported-housing/#{specific_scheme.id}"
+ get "/schemes/#{specific_scheme.id}"
expect(page).to have_content(specific_scheme.code)
expect(page).to have_content(specific_scheme.service_name)
expect(page).to have_content(specific_scheme.organisation.name)
@@ -211,11 +211,11 @@ RSpec.describe SchemesController, type: :request do
expect(page).to have_content(specific_scheme.intended_stay_display)
end
- context "when coordinator attempts to see scheme belogning to a different organisation" do
+ context "when coordinator attempts to see scheme belonging to a different organisation" do
let!(:specific_scheme) { FactoryBot.create(:scheme) }
it "returns 404 not found" do
- get "/supported-housing/#{specific_scheme.id}"
+ get "/schemes/#{specific_scheme.id}"
expect(response).to have_http_status(:not_found)
end
end
@@ -225,7 +225,7 @@ RSpec.describe SchemesController, type: :request do
before do
allow(user).to receive(:need_two_factor_authentication?).and_return(false)
sign_in user
- get "/supported-housing/#{specific_scheme.id}"
+ get "/schemes/#{specific_scheme.id}"
end
it "has page heading" do
@@ -246,4 +246,199 @@ RSpec.describe SchemesController, type: :request do
end
end
end
+
+ describe "#locations" do
+ let(:specific_scheme) { schemes.first }
+
+ context "when not signed in" do
+ it "redirects to the sign in page" do
+ get "/schemes/#{specific_scheme.id}/locations"
+ expect(response).to redirect_to("/account/sign-in")
+ end
+ end
+
+ context "when signed in as a data provider user" do
+ let(:user) { FactoryBot.create(:user) }
+
+ before do
+ sign_in user
+ get "/schemes/#{specific_scheme.id}/locations"
+ end
+
+ it "returns 401 unauthorized" do
+ request
+ expect(response).to have_http_status(:unauthorized)
+ end
+ end
+
+ context "when signed in as a data coordinator user" do
+ let(:user) { FactoryBot.create(:user, :data_coordinator) }
+ let!(:scheme) { FactoryBot.create(:scheme, organisation: user.organisation) }
+ let!(:locations) { FactoryBot.create_list(:location, 3, scheme:) }
+
+ before do
+ sign_in user
+ get "/schemes/#{scheme.id}/locations"
+ end
+
+ context "when coordinator attempts to see scheme belonging to a different organisation" do
+ let!(:specific_scheme) { FactoryBot.create(:scheme) }
+
+ before do
+ FactoryBot.create(:location, scheme: specific_scheme)
+ end
+
+ it "returns 404 not found" do
+ get "/schemes/#{specific_scheme.id}/locations"
+ expect(response).to have_http_status(:not_found)
+ end
+ end
+
+ it "shows scheme" do
+ locations.each do |location|
+ expect(page).to have_content(location.location_code)
+ expect(page).to have_content(location.postcode)
+ expect(page).to have_content(location.county)
+ expect(page).to have_content(location.type_of_unit)
+ expect(page).to have_content(location.type_of_building)
+ expect(page).to have_content(location.wheelchair_adaptation)
+ expect(page).to have_content(location.address_line1)
+ expect(page).to have_content(location.address_line2)
+ end
+ end
+
+ it "has page heading" do
+ expect(page).to have_content(scheme.service_name)
+ end
+
+ it "has correct title" do
+ expect(page).to have_title("#{scheme.service_name} - Submit social housing lettings and sales data (CORE) - GOV.UK")
+ end
+
+ context "when paginating over 20 results" do
+ let!(:locations) { FactoryBot.create_list(:location, 25, scheme:) }
+
+ context "when on the first page" do
+ before do
+ get "/schemes/#{scheme.id}/locations"
+ end
+
+ it "shows which schemes are being shown on the current page" do
+ expect(CGI.unescape_html(response.body)).to match("Showing 1 to 20 of #{locations.count} locations")
+ end
+
+ it "has correct page 1 of 2 title" do
+ expect(page).to have_title("#{scheme.service_name} (page 1 of 2) - Submit social housing lettings and sales data (CORE) - GOV.UK")
+ end
+
+ it "has pagination links" do
+ expect(page).to have_content("Previous")
+ expect(page).not_to have_link("Previous")
+ expect(page).to have_content("Next")
+ expect(page).to have_link("Next")
+ end
+ end
+
+ context "when on the second page" do
+ before do
+ get "/schemes/#{scheme.id}/locations?page=2"
+ end
+
+ it "shows which schemes are being shown on the current page" do
+ expect(CGI.unescape_html(response.body)).to match("Showing 21 to 25 of #{locations.count} locations")
+ end
+
+ it "has correct page 1 of 2 title" do
+ expect(page).to have_title("#{scheme.service_name} (page 2 of 2) - Submit social housing lettings and sales data (CORE) - GOV.UK")
+ end
+
+ it "has pagination links" do
+ expect(page).to have_content("Previous")
+ expect(page).to have_link("Previous")
+ expect(page).to have_content("Next")
+ expect(page).not_to have_link("Next")
+ end
+ end
+ end
+ end
+
+ context "when signed in as a support user" do
+ let(:user) { FactoryBot.create(:user, :support) }
+ let!(:scheme) { FactoryBot.create(:scheme) }
+ let!(:locations) { FactoryBot.create_list(:location, 3, scheme:) }
+
+ before do
+ allow(user).to receive(:need_two_factor_authentication?).and_return(false)
+ sign_in user
+ get "/schemes/#{scheme.id}/locations"
+ end
+
+ it "shows scheme" do
+ locations.each do |location|
+ expect(page).to have_content(location.location_code)
+ expect(page).to have_content(location.postcode)
+ expect(page).to have_content(location.county)
+ expect(page).to have_content(location.type_of_unit)
+ expect(page).to have_content(location.type_of_building)
+ expect(page).to have_content(location.wheelchair_adaptation)
+ expect(page).to have_content(location.address_line1)
+ expect(page).to have_content(location.address_line2)
+ end
+ end
+
+ it "has page heading" do
+ expect(page).to have_content(scheme.service_name)
+ end
+
+ it "has correct title" do
+ expect(page).to have_title("#{scheme.service_name} - Submit social housing lettings and sales data (CORE) - GOV.UK")
+ end
+
+ context "when paginating over 20 results" do
+ let!(:locations) { FactoryBot.create_list(:location, 25, scheme:) }
+
+ context "when on the first page" do
+ before do
+ get "/schemes/#{scheme.id}/locations"
+ end
+
+ it "shows which schemes are being shown on the current page" do
+ expect(CGI.unescape_html(response.body)).to match("Showing 1 to 20 of #{locations.count} locations")
+ end
+
+ it "has correct page 1 of 2 title" do
+ expect(page).to have_title("#{scheme.service_name} (page 1 of 2) - Submit social housing lettings and sales data (CORE) - GOV.UK")
+ end
+
+ it "has pagination links" do
+ expect(page).to have_content("Previous")
+ expect(page).not_to have_link("Previous")
+ expect(page).to have_content("Next")
+ expect(page).to have_link("Next")
+ end
+ end
+
+ context "when on the second page" do
+ before do
+ get "/schemes/#{scheme.id}/locations?page=2"
+ end
+
+ it "shows which schemes are being shown on the current page" do
+ expect(CGI.unescape_html(response.body)).to match("Showing 21 to 25 of #{locations.count} locations")
+ end
+
+ it "has correct page 1 of 2 title" do
+ expect(page).to have_title("#{scheme.service_name} (page 2 of 2) - Submit social housing lettings and sales data (CORE) - GOV.UK")
+ end
+
+ it "has pagination links" do
+ expect(page).to have_content("Previous")
+ expect(page).to have_link("Previous")
+ expect(page).to have_content("Next")
+ expect(page).not_to have_link("Next")
+ end
+ end
+ end
+ end
+ end
end