diff --git a/app/models/form/sales/pages/armed_forces.rb b/app/models/form/sales/pages/armed_forces.rb index 8a85d1817..006380f02 100644 --- a/app/models/form/sales/pages/armed_forces.rb +++ b/app/models/form/sales/pages/armed_forces.rb @@ -12,4 +12,4 @@ class Form::Sales::Pages::ArmedForces < ::Form::Page Form::Sales::Questions::ArmedForces.new(nil, nil, self), ] end -end \ No newline at end of file +end diff --git a/app/models/form/sales/questions/armed_forces.rb b/app/models/form/sales/questions/armed_forces.rb index f7b0abc1e..6822e712a 100644 --- a/app/models/form/sales/questions/armed_forces.rb +++ b/app/models/form/sales/questions/armed_forces.rb @@ -16,4 +16,4 @@ class Form::Sales::Questions::ArmedForces < ::Form::Question "3" => { "value" => "Buyer prefers not to say" }, "8" => { "value" => "Don't know" }, }.freeze -end \ No newline at end of file +end diff --git a/db/schema.rb b/db/schema.rb index 19ced9761..47ed036f6 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -415,13 +415,13 @@ ActiveRecord::Schema[7.0].define(version: 2022_12_23_134818) do t.integer "ecstat4" t.integer "ecstat5" t.integer "ecstat6" + t.integer "disabled" + t.integer "hhregres" + t.integer "wheel_value_check" t.integer "pregyrha" t.integer "pregla" t.integer "pregghb" t.integer "pregother" - t.integer "disabled" - t.integer "hhregres" - t.integer "wheel_value_check" t.index ["created_by_id"], name: "index_sales_logs_on_created_by_id" t.index ["managing_organisation_id"], name: "index_sales_logs_on_managing_organisation_id" t.index ["owning_organisation_id"], name: "index_sales_logs_on_owning_organisation_id" diff --git a/spec/factories/sales_log.rb b/spec/factories/sales_log.rb index c40200b90..6801e546f 100644 --- a/spec/factories/sales_log.rb +++ b/spec/factories/sales_log.rb @@ -73,6 +73,7 @@ FactoryBot.define do pregother { 1 } pregghb { 1 } disabled { 1 } + hhregres { 1 } end end end diff --git a/spec/models/form/sales/pages/armed_forces_spec.rb b/spec/models/form/sales/pages/armed_forces_spec.rb index bffe25a38..ac9c38e5d 100644 --- a/spec/models/form/sales/pages/armed_forces_spec.rb +++ b/spec/models/form/sales/pages/armed_forces_spec.rb @@ -26,4 +26,4 @@ RSpec.describe Form::Sales::Pages::ArmedForces, type: :model do it "has the correct description" do expect(page.description).to eq("") end -end \ No newline at end of file +end diff --git a/spec/models/form/sales/questions/armed_forces_spec.rb b/spec/models/form/sales/questions/armed_forces_spec.rb index 80e293d78..d84b9fbb5 100644 --- a/spec/models/form/sales/questions/armed_forces_spec.rb +++ b/spec/models/form/sales/questions/armed_forces_spec.rb @@ -43,4 +43,4 @@ RSpec.describe Form::Sales::Questions::ArmedForces, type: :model do "8" => { "value" => "Don't know" }, }) end -end \ No newline at end of file +end diff --git a/spec/models/form/sales/subsections/household_needs_spec.rb b/spec/models/form/sales/subsections/household_needs_spec.rb index f55970ed9..92bef0879 100644 --- a/spec/models/form/sales/subsections/household_needs_spec.rb +++ b/spec/models/form/sales/subsections/household_needs_spec.rb @@ -17,6 +17,7 @@ RSpec.describe Form::Sales::Subsections::HouseholdNeeds, type: :model do armed_forces household_wheelchair household_disability + wheelchair_check ], ) end diff --git a/spec/models/form_handler_spec.rb b/spec/models/form_handler_spec.rb index 1f6f4676c..e69ffc524 100644 --- a/spec/models/form_handler_spec.rb +++ b/spec/models/form_handler_spec.rb @@ -52,14 +52,14 @@ RSpec.describe FormHandler do it "is able to load a current sales form" do form = form_handler.get_form("current_sales") expect(form).to be_a(Form) - expect(form.pages.count).to eq(71) + expect(form.pages.count).to eq(72) expect(form.name).to eq("2022_2023_sales") end it "is able to load a previous sales form" do form = form_handler.get_form("previous_sales") expect(form).to be_a(Form) - expect(form.pages.count).to eq(71) + expect(form.pages.count).to eq(72) expect(form.name).to eq("2021_2022_sales") end end