* feat: remove redundant cols from locations table
* feat: add status col to locations table
* test: start adding status tag tests
* test: pick the simplest format for the tag helper tests
* feat: make the locations table (plus related content above & below) 2/3 width
* feat: add incomplete to location status method
* test: all status tag helpers
* test: update test text to match what's being tested
* test: update locations list test in locations_controller_spec.rb
* test: update locations list test in schemes feature tests
* test: that status=incomplete when mandatory info is missing
* feat: simplify logic for incomplete status
Co-authored-by: James Rose <james@jbpr.net>
* feat: hide new locations table layout behind feature flag
* feat: use route helpers to get scheme_location path
* feat: simplify "scheme_id: @scheme.id" to "@scheme"
* feat: reference location, not @location, in scheme_location_path
* feat: reorder postcode and code in locations table
* feat: change ' ' to "" in location_spec
* feat: update wording and ordering for 'view location details' page
* test: re-add tests for locations page when new layout not enabled
* test: check for mobility_type and location_admin_district in locations_controller as support user
* test: update locations helper test to match new field naming and ordering
* feat: always scale locations list by 2/3, not just when new layout used
* feat: scale the scheme details page by 2/3 to match the locations list page
* feat: only make scheme details and locations pages 2/3 scale if feature toggle on
* test: mock new locations layout feature toggle in tests
* feat: use the existing location_toggle_enabled instead of new_locations_table_layout_enabled
* refactor: don't use html inside ruby in locations index page
* refactor: use Rails routes in all places in locations index page
* style: lint
* feat: move logic from views/schemes/show into schemes_helper
* refactor: make consistent the removal of fields from SchemeHelper base_attributes
* test: improvements to tests
* test: make 'returns correct display attributes' tests sensible
* test: check scheme toggle off => no scheme status shown
* style: correct indentation in spec/helpers/schemes_helper_spec.rb
* test: that when owning = managing, "Organisation providing support" hidden
* style: lint code
* test: don't set scheme id explicitly in schemes_helper_spec
* style: reorder tag helper spec to match tag helper
* refactor: ensure display_scheme_attributes always takes user type
* test: make location incomplete status depend on location.confirmed
* test: add missing location validations for nil postcode & mobility type
Co-authored-by: James Rose <james@jbpr.net>
<% display_scheme_attributes(@scheme).each do |attr| %>
<% display_scheme_attributes(@scheme, current_user).each do |attr| %>
<% next if current_user.data_coordinator? && attr[:name] == ("Housing stock owned by") %>
<%= summary_list.row do |row| %>
<%= summary_list.row do |row| %>
<% row.key { attr[:name] } %>
<% row.key { attr[:name].eql?("Registered under Care Standards Act 2000") ? "Registered under Care Standards Act 2000" : attr[:name].to_s.humanize } %>
expect(availability_attribute).toeq("Active from 1 April 2022 to 9 August 2022\nDeactivated on 10 August 2022\nActive from 1 September 2022 to 14 September 2022\nDeactivated on 15 September 2022\nActive from 28 September 2022")
expect(availability_attribute).toeq("Active from 1 April 2022 to 9 August 2022\nDeactivated on 10 August 2022\nActive from 1 September 2022 to 14 September 2022\nDeactivated on 15 September 2022\nActive from 28 September 2022")
end
end
@ -149,7 +206,7 @@ RSpec.describe SchemesHelper do
expect(availability_attribute).toeq("Active from 1 April 2022 to 9 August 2022\nDeactivated on 10 August 2022\nActive from 1 September 2022 to 14 September 2022\nDeactivated on 15 September 2022")
expect(availability_attribute).toeq("Active from 1 April 2022 to 9 August 2022\nDeactivated on 10 August 2022\nActive from 1 September 2022 to 14 September 2022\nDeactivated on 15 September 2022")
end
end
@ -165,7 +222,7 @@ RSpec.describe SchemesHelper do
expect(availability_attribute).toeq("Active from 1 April 2022 to 14 June 2022\nDeactivated on 15 June 2022\nActive from 18 June 2022 to 23 September 2022\nDeactivated on 24 September 2022\nActive from 28 September 2022")
expect(availability_attribute).toeq("Active from 1 April 2022 to 14 June 2022\nDeactivated on 15 June 2022\nActive from 18 June 2022 to 23 September 2022\nDeactivated on 24 September 2022\nActive from 28 September 2022")
end
end
@ -179,7 +236,7 @@ RSpec.describe SchemesHelper do
expect(availability_attribute).toeq("Active from 1 April 2022 to 14 June 2022\nDeactivated on 15 June 2022\nActive from 28 September 2022 to 23 October 2022\nDeactivated on 24 October 2022\nActive from 28 October 2022")
expect(availability_attribute).toeq("Active from 1 April 2022 to 14 June 2022\nDeactivated on 15 June 2022\nActive from 28 September 2022 to 23 October 2022\nDeactivated on 24 October 2022\nActive from 28 October 2022")
end
end
@ -211,7 +268,7 @@ RSpec.describe SchemesHelper do
it"does add an error when the postcode is invalid"do
it"does add an error when the number of units is invalid"do
location.units=nil
location.units=nil
expect{location.save!}
expect{location.save!}
.toraise_error(ActiveRecord::RecordInvalid,"Validation failed: Units #{I18n.t('activerecord.errors.models.location.attributes.units.blank')}")
.toraise_error(ActiveRecord::RecordInvalid,"Validation failed: Units #{I18n.t('activerecord.errors.models.location.attributes.units.blank')}")
@ -49,13 +55,23 @@ RSpec.describe Location, type: :model do
describe"#type_of_unit"do
describe"#type_of_unit"do
let(:location){FactoryBot.build(:location)}
let(:location){FactoryBot.build(:location)}
it"does add an error when the postcode is invalid"do
it"does add an error when the type of unit is invalid"do
location.type_of_unit=nil
location.type_of_unit=nil
expect{location.save!}
expect{location.save!}
.toraise_error(ActiveRecord::RecordInvalid,"Validation failed: Type of unit #{I18n.t('activerecord.errors.models.location.attributes.type_of_unit.blank')}")
.toraise_error(ActiveRecord::RecordInvalid,"Validation failed: Type of unit #{I18n.t('activerecord.errors.models.location.attributes.type_of_unit.blank')}")
end
end
end
end
describe"#mobility_type"do
let(:location){FactoryBot.build(:location)}
it"does add an error when the mobility type is invalid"do
location.mobility_type=nil
expect{location.save!}
.toraise_error(ActiveRecord::RecordInvalid,"Validation failed: Mobility type #{I18n.t('activerecord.errors.models.location.attributes.mobility_type.blank')}")
end
end
describe"paper trail"do
describe"paper trail"do
let(:location){FactoryBot.create(:location)}
let(:location){FactoryBot.create(:location)}
let!(:name){location.name}
let!(:name){location.name}
@ -123,6 +139,13 @@ RSpec.describe Location, type: :model do
Timecop.unfreeze
Timecop.unfreeze
end
end
context"when location is not confirmed"do
it"returns incomplete "do
location.confirmed=false
expect(location.status).toeq(:incomplete)
end
end
context"when there have not been any previous deactivations"do
context"when there have not been any previous deactivations"do
it"returns active if the location has no deactivation records"do
it"returns active if the location has no deactivation records"do
SamSeed-Softwire
2 years ago
committed by
GitHub