diff --git a/db/schema.rb b/db/schema.rb index d25675cbc..b8e0da05e 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -345,13 +345,10 @@ ActiveRecord::Schema[7.0].define(version: 2022_09_29_125204) do t.integer "proptype" t.integer "age2" t.integer "age2_known" - t.integer "ethnic" - t.integer "ethnic_group" - t.integer "national" - t.string "othernational" - t.integer "buy1livein" t.string "relat2" t.string "otherrelat2" + t.integer "ethnic" + t.integer "ethnic_group" 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/models/form/sales/subsections/household_characteristics_spec.rb b/spec/models/form/sales/subsections/household_characteristics_spec.rb index 6460e1fa9..e2e8e0a90 100644 --- a/spec/models/form/sales/subsections/household_characteristics_spec.rb +++ b/spec/models/form/sales/subsections/household_characteristics_spec.rb @@ -16,6 +16,7 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model %w[ 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 @@ -24,7 +25,6 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model buyer_1_ethnic_background_arab buyer_1_ethnic_background_mixed buyer_1_ethnic_background_white - buyer_1_nationality buyer_2_age ], )