feat: update schema and tests

app/models/form/sales/subsections/household_characteristics.rb

@@ -12,15 +12,15 @@ class Form::Sales::Subsections::HouseholdCharacteristics < ::Form::Subsection
       Form::Sales::Pages::BuyerInterview.new(nil, nil, self),
       Form::Sales::Pages::Age1.new(nil, nil, self),
       Form::Sales::Pages::GenderIdentity1.new(nil, nil, self),
-      Form::Sales::Pages::Nationality1.new(nil, nil, self),
-      Form::Sales::Pages::Buyer1LiveInProperty.new(nil, nil, self),
-      Form::Sales::Pages::Buyer2RelationshipToBuyer1.new(nil, nil, self),
       Form::Sales::Pages::Buyer1EthnicGroup.new(nil, nil, self),
       Form::Sales::Pages::Buyer1EthnicBackgroundBlack.new(nil, nil, self),
       Form::Sales::Pages::Buyer1EthnicBackgroundAsian.new(nil, nil, self),
       Form::Sales::Pages::Buyer1EthnicBackgroundArab.new(nil, nil, self),
       Form::Sales::Pages::Buyer1EthnicBackgroundMixed.new(nil, nil, self),
       Form::Sales::Pages::Buyer1EthnicBackgroundWhite.new(nil, nil, self),
+      Form::Sales::Pages::Nationality1.new(nil, nil, self),
+      Form::Sales::Pages::Buyer1LiveInProperty.new(nil, nil, self),
+      Form::Sales::Pages::Buyer2RelationshipToBuyer1.new(nil, nil, self),
       Form::Sales::Pages::Age2.new(nil, nil, self),
       Form::Sales::Pages::GenderIdentity2.new(nil, nil, self),
       Form::Sales::Pages::Buyer2WorkingSituation.new(nil, nil, self),

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_10_03_150610) do
+ActiveRecord::Schema[7.0].define(version: 2022_10_04_095132) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 

spec/models/form/sales/subsections/household_characteristics_spec.rb

@@ -17,15 +17,15 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model
         buyer_interview
         buyer_1_age
         buyer_1_gender_identity
-        buyer_1_nationality
-        buyer_1_live_in_property
-        buyer_2_relationship_to_buyer_1
         buyer_1_ethnic_group
         buyer_1_ethnic_background_black
         buyer_1_ethnic_background_asian
         buyer_1_ethnic_background_arab
         buyer_1_ethnic_background_mixed
         buyer_1_ethnic_background_white
+        buyer_1_nationality
+        buyer_1_live_in_property
+        buyer_2_relationship_to_buyer_1
         buyer_2_age
         buyer_2_gender_identity
         buyer_2_working_situation