diff --git a/spec/helpers/locations_helper_spec.rb b/spec/helpers/locations_helper_spec.rb index 354b948d4..368833bd2 100644 --- a/spec/helpers/locations_helper_spec.rb +++ b/spec/helpers/locations_helper_spec.rb @@ -140,13 +140,13 @@ RSpec.describe LocationsHelper do attributes = [ { attribute: "postcode", name: "Postcode", value: location.postcode }, { attribute: "name", name: "Location name", value: location.name }, + { attribute: "status", name: "Status", value: :active }, { attribute: "local_authority", name: "Local authority", value: location.location_admin_district }, { attribute: "units", name: "Number of units", value: location.units }, { attribute: "type_of_unit", name: "Most common unit", value: location.type_of_unit }, { attribute: "mobility_standards", name: "Mobility standards", value: location.mobility_type }, { attribute: "location_code", name: "Location code", value: location.location_code }, { attribute: "availability", name: "Availability", value: "Active from 1 April 2022" }, - { attribute: "status", name: "Status", value: :active }, ] expect(display_location_attributes(location)).to eq(attributes) @@ -162,13 +162,13 @@ RSpec.describe LocationsHelper do attributes = [ { attribute: "postcode", name: "Postcode", value: location.postcode }, { attribute: "name", name: "Location name", value: location.name }, + { attribute: "status", name: "Status", value: :active }, { attribute: "local_authority", name: "Local authority", value: "Eden (until 31 March 2023)\nCumberland (1 April 2023 - present)" }, { attribute: "units", name: "Number of units", value: location.units }, { attribute: "type_of_unit", name: "Most common unit", value: location.type_of_unit }, { attribute: "mobility_standards", name: "Mobility standards", value: location.mobility_type }, { attribute: "location_code", name: "Location code", value: "E07000030 (until 31 March 2023)\nE06000063 (1 April 2023 - present)" }, { attribute: "availability", name: "Availability", value: "Active from 1 April 2022" }, - { attribute: "status", name: "Status", value: :active }, ] expect(display_location_attributes(location)).to eq(attributes) @@ -185,13 +185,13 @@ RSpec.describe LocationsHelper do attributes = [ { attribute: "postcode", name: "Postcode", value: location.postcode }, { attribute: "name", name: "Location name", value: location.name }, + { attribute: "status", name: "Status", value: :incomplete }, { attribute: "local_authority", name: "Local authority", value: "" }, { attribute: "units", name: "Number of units", value: location.units }, { attribute: "type_of_unit", name: "Most common unit", value: location.type_of_unit }, { attribute: "mobility_standards", name: "Mobility standards", value: location.mobility_type }, { attribute: "location_code", name: "Location code", value: "" }, { attribute: "availability", name: "Availability", value: "Active from 1 April 2022" }, - { attribute: "status", name: "Status", value: :incomplete }, ] expect(display_location_attributes(location)).to eq(attributes) diff --git a/spec/helpers/schemes_helper_spec.rb b/spec/helpers/schemes_helper_spec.rb index 905494ac8..c2350d428 100644 --- a/spec/helpers/schemes_helper_spec.rb +++ b/spec/helpers/schemes_helper_spec.rb @@ -115,6 +115,7 @@ RSpec.describe SchemesHelper do attributes = [ { name: "Scheme code", value: "S#{scheme.id}" }, { name: "Name", value: "Test service_name", edit: true }, + { name: "Status", value: status_tag(:incomplete) }, { name: "Confidential information", value: "No", edit: true }, { name: "Type of scheme", value: "Housing for older people" }, { name: "Registered under Care Standards Act 2000", value: "Yes – registered care home providing personal care" }, @@ -126,7 +127,6 @@ RSpec.describe SchemesHelper do { name: "Level of support given", value: "High level" }, { name: "Intended length of stay", value: "Permanent" }, { name: "Availability", value: "Active from 1 April 2021" }, - { name: "Status", value: status_tag(:incomplete) }, ] expect(display_scheme_attributes(scheme, support_user)).to eq(attributes) end @@ -135,6 +135,7 @@ RSpec.describe SchemesHelper do attributes = [ { name: "Scheme code", value: "S#{scheme.id}" }, { name: "Name", value: "Test service_name", edit: true }, + { name: "Status", value: status_tag(:incomplete) }, { name: "Confidential information", value: "No", edit: true }, { name: "Type of scheme", value: "Housing for older people" }, { name: "Registered under Care Standards Act 2000", value: "Yes – registered care home providing personal care" }, @@ -145,7 +146,6 @@ RSpec.describe SchemesHelper do { name: "Level of support given", value: "High level" }, { name: "Intended length of stay", value: "Permanent" }, { name: "Availability", value: "Active from 1 April 2021" }, - { name: "Status", value: status_tag(:incomplete) }, ] expect(display_scheme_attributes(scheme, coordinator_user)).to eq(attributes) end @@ -160,6 +160,7 @@ RSpec.describe SchemesHelper do attributes = [ { name: "Scheme code", value: "S#{scheme.id}" }, { name: "Name", value: "Test service_name", edit: true }, + { name: "Status", value: status_tag(:active) }, { name: "Confidential information", value: "No", edit: true }, { name: "Type of scheme", value: "Housing for older people" }, { name: "Registered under Care Standards Act 2000", value: "Yes – registered care home providing personal care" }, @@ -171,7 +172,6 @@ RSpec.describe SchemesHelper do { name: "Level of support given", value: "High level" }, { name: "Intended length of stay", value: "Permanent" }, { name: "Availability", value: "Active from 1 April 2021" }, - { name: "Status", value: status_tag(:active) }, ] expect(display_scheme_attributes(scheme, support_user)).to eq(attributes) end @@ -180,6 +180,7 @@ RSpec.describe SchemesHelper do attributes = [ { name: "Scheme code", value: "S#{scheme.id}" }, { name: "Name", value: "Test service_name", edit: true }, + { name: "Status", value: status_tag(:active) }, { name: "Confidential information", value: "No", edit: true }, { name: "Type of scheme", value: "Housing for older people" }, { name: "Registered under Care Standards Act 2000", value: "Yes – registered care home providing personal care" }, @@ -190,7 +191,6 @@ RSpec.describe SchemesHelper do { name: "Level of support given", value: "High level" }, { name: "Intended length of stay", value: "Permanent" }, { name: "Availability", value: "Active from 1 April 2021" }, - { name: "Status", value: status_tag(:active) }, ] expect(display_scheme_attributes(scheme, coordinator_user)).to eq(attributes) end