From 8af7e09c1cb547b7c7beafed8bf681f68aa77563 Mon Sep 17 00:00:00 2001
From: natdeanlewissoftwire
 <94526761+natdeanlewissoftwire@users.noreply.github.com>
Date: Mon, 9 Jan 2023 15:38:41 +0000
Subject: [PATCH] person-gender-identity (#1100)

* feat: add gender identity questions for all 4 people, combine into single page/question

* feat: update schema and add tests

* tests: update tests

* feat: update to main

* feat: update db and test
---
 .../sales/pages/person1_gender_identity.rb    |  18 --
 .../person1_gender_identity_joint_purchase.rb |  18 --
 .../sales/pages/person_gender_identity.rb     |  17 ++
 .../questions/person1_gender_identity.rb      |  18 --
 .../sales/questions/person_gender_identity.rb |  18 ++
 .../subsections/household_characteristics.rb  |  10 +-
 .../20221216122909_add_sexes_to_sales_log.rb  |   9 +
 db/schema.rb                                  |   3 +
 spec/factories/sales_log.rb                   |   3 +
 ...on1_gender_identity_joint_purchase_spec.rb |  33 ---
 .../pages/person1_gender_identity_spec.rb     |  33 ---
 .../pages/person_gender_identity_spec.rb      | 178 +++++++++++++
 .../questions/person1_gender_identity_spec.rb |  46 ----
 .../questions/person_gender_identity_spec.rb  | 247 ++++++++++++++++++
 .../household_characteristics_spec.rb         |   6 +
 spec/models/form_handler_spec.rb              |   4 +-
 16 files changed, 491 insertions(+), 170 deletions(-)
 delete mode 100644 app/models/form/sales/pages/person1_gender_identity.rb
 delete mode 100644 app/models/form/sales/pages/person1_gender_identity_joint_purchase.rb
 create mode 100644 app/models/form/sales/pages/person_gender_identity.rb
 delete mode 100644 app/models/form/sales/questions/person1_gender_identity.rb
 create mode 100644 app/models/form/sales/questions/person_gender_identity.rb
 create mode 100644 db/migrate/20221216122909_add_sexes_to_sales_log.rb
 delete mode 100644 spec/models/form/sales/pages/person1_gender_identity_joint_purchase_spec.rb
 delete mode 100644 spec/models/form/sales/pages/person1_gender_identity_spec.rb
 create mode 100644 spec/models/form/sales/pages/person_gender_identity_spec.rb
 delete mode 100644 spec/models/form/sales/questions/person1_gender_identity_spec.rb
 create mode 100644 spec/models/form/sales/questions/person_gender_identity_spec.rb

diff --git a/app/models/form/sales/pages/person1_gender_identity.rb b/app/models/form/sales/pages/person1_gender_identity.rb
deleted file mode 100644
index 7cc62f4d3..000000000
--- a/app/models/form/sales/pages/person1_gender_identity.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-class Form::Sales::Pages::Person1GenderIdentity < ::Form::Page
-  def initialize(id, hsh, subsection)
-    super
-    @id = "person_1_gender_identity"
-    @header = ""
-    @description = ""
-    @subsection = subsection
-    @depends_on = [
-      { "details_known_1" => 1, "jointpur" => 2 },
-    ]
-  end
-
-  def questions
-    @questions ||= [
-      Form::Sales::Questions::Person1GenderIdentity.new("sex2", nil, self),
-    ]
-  end
-end
diff --git a/app/models/form/sales/pages/person1_gender_identity_joint_purchase.rb b/app/models/form/sales/pages/person1_gender_identity_joint_purchase.rb
deleted file mode 100644
index 2ef9e249a..000000000
--- a/app/models/form/sales/pages/person1_gender_identity_joint_purchase.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-class Form::Sales::Pages::Person1GenderIdentityJointPurchase < ::Form::Page
-  def initialize(id, hsh, subsection)
-    super
-    @id = "person_1_gender_identity_joint_purchase"
-    @header = ""
-    @description = ""
-    @subsection = subsection
-    @depends_on = [
-      { "details_known_1" => 1, "jointpur" => 1 },
-    ]
-  end
-
-  def questions
-    @questions ||= [
-      Form::Sales::Questions::Person1GenderIdentity.new("sex3", nil, self),
-    ]
-  end
-end
diff --git a/app/models/form/sales/pages/person_gender_identity.rb b/app/models/form/sales/pages/person_gender_identity.rb
new file mode 100644
index 000000000..11ff0ac98
--- /dev/null
+++ b/app/models/form/sales/pages/person_gender_identity.rb
@@ -0,0 +1,17 @@
+class Form::Sales::Pages::PersonGenderIdentity < Form::Sales::Pages::Person
+  def initialize(id, hsh, subsection, person_index:)
+    super
+    @header = ""
+    @description = ""
+    @subsection = subsection
+    @depends_on = [
+      { details_known_question_id => 1, "jointpur" => joint_purchase? ? 1 : 2 },
+    ]
+  end
+
+  def questions
+    @questions ||= [
+      Form::Sales::Questions::PersonGenderIdentity.new(field_for_person("sex"), nil, self, person_index: @person_index),
+    ]
+  end
+end
diff --git a/app/models/form/sales/questions/person1_gender_identity.rb b/app/models/form/sales/questions/person1_gender_identity.rb
deleted file mode 100644
index f525308f5..000000000
--- a/app/models/form/sales/questions/person1_gender_identity.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-class Form::Sales::Questions::Person1GenderIdentity < ::Form::Question
-  def initialize(id, hsh, page)
-    super
-    @check_answer_label = "Person 1’s gender identity"
-    @header = "Which of these best describes Person 1’s gender identity?"
-    @type = "radio"
-    @page = page
-    @answer_options = ANSWER_OPTIONS
-    @check_answers_card_number = id == "sex2" ? 2 : 3
-  end
-
-  ANSWER_OPTIONS = {
-    "F" => { "value" => "Female" },
-    "M" => { "value" => "Male" },
-    "X" => { "value" => "Non-binary" },
-    "R" => { "value" => "Buyer prefers not to say" },
-  }.freeze
-end
diff --git a/app/models/form/sales/questions/person_gender_identity.rb b/app/models/form/sales/questions/person_gender_identity.rb
new file mode 100644
index 000000000..db1f44f0f
--- /dev/null
+++ b/app/models/form/sales/questions/person_gender_identity.rb
@@ -0,0 +1,18 @@
+class Form::Sales::Questions::PersonGenderIdentity < ::Form::Sales::Questions::Person
+  def initialize(id, hsh, page, person_index:)
+    super
+    @check_answer_label = "Person #{person_display_number}’s gender identity"
+    @header = "Which of these best describes Person #{person_display_number}’s gender identity?"
+    @type = "radio"
+    @page = page
+    @answer_options = ANSWER_OPTIONS
+    @check_answers_card_number = person_index
+  end
+
+  ANSWER_OPTIONS = {
+    "F" => { "value" => "Female" },
+    "M" => { "value" => "Male" },
+    "X" => { "value" => "Non-binary" },
+    "R" => { "value" => "Person prefers not to say" },
+  }.freeze
+end
diff --git a/app/models/form/sales/subsections/household_characteristics.rb b/app/models/form/sales/subsections/household_characteristics.rb
index 763577ffe..5fe1175e3 100644
--- a/app/models/form/sales/subsections/household_characteristics.rb
+++ b/app/models/form/sales/subsections/household_characteristics.rb
@@ -35,8 +35,8 @@ class Form::Sales::Subsections::HouseholdCharacteristics < ::Form::Subsection
       Form::Sales::Pages::PersonRelationshipToBuyer1.new("person_1_relationship_to_buyer_1_joint_purchase", nil, self, person_index: 3),
       Form::Sales::Pages::PersonAge.new("person_1_age", nil, self, person_index: 2),
       Form::Sales::Pages::PersonAge.new("person_1_age_joint_purchase", nil, self, person_index: 3),
-      Form::Sales::Pages::Person1GenderIdentity.new(nil, nil, self),
-      Form::Sales::Pages::Person1GenderIdentityJointPurchase.new(nil, nil, self),
+      Form::Sales::Pages::PersonGenderIdentity.new("person_1_gender_identity", nil, self, person_index: 2),
+      Form::Sales::Pages::PersonGenderIdentity.new("person_1_gender_identity_joint_purchase", nil, self, person_index: 3),
       Form::Sales::Pages::PersonWorkingSituation.new("person_1_working_situation", nil, self, person_index: 2),
       Form::Sales::Pages::PersonWorkingSituation.new("person_1_working_situation_joint_purchase", nil, self, person_index: 3),
       Form::Sales::Pages::PersonKnown.new("person_2_known", nil, self, person_index: 3),
@@ -45,6 +45,8 @@ class Form::Sales::Subsections::HouseholdCharacteristics < ::Form::Subsection
       Form::Sales::Pages::PersonRelationshipToBuyer1.new("person_2_relationship_to_buyer_1_joint_purchase", nil, self, person_index: 4),
       Form::Sales::Pages::PersonAge.new("person_2_age", nil, self, person_index: 3),
       Form::Sales::Pages::PersonAge.new("person_2_age_joint_purchase", nil, self, person_index: 4),
+      Form::Sales::Pages::PersonGenderIdentity.new("person_2_gender_identity", nil, self, person_index: 3),
+      Form::Sales::Pages::PersonGenderIdentity.new("person_2_gender_identity_joint_purchase", nil, self, person_index: 4),
       Form::Sales::Pages::PersonWorkingSituation.new("person_2_working_situation", nil, self, person_index: 3),
       Form::Sales::Pages::PersonWorkingSituation.new("person_2_working_situation_joint_purchase", nil, self, person_index: 4),
       Form::Sales::Pages::PersonKnown.new("person_3_known", nil, self, person_index: 4),
@@ -53,6 +55,8 @@ class Form::Sales::Subsections::HouseholdCharacteristics < ::Form::Subsection
       Form::Sales::Pages::PersonRelationshipToBuyer1.new("person_3_relationship_to_buyer_1_joint_purchase", nil, self, person_index: 5),
       Form::Sales::Pages::PersonAge.new("person_3_age", nil, self, person_index: 4),
       Form::Sales::Pages::PersonAge.new("person_3_age_joint_purchase", nil, self, person_index: 5),
+      Form::Sales::Pages::PersonGenderIdentity.new("person_3_gender_identity", nil, self, person_index: 4),
+      Form::Sales::Pages::PersonGenderIdentity.new("person_3_gender_identity_joint_purchase", nil, self, person_index: 5),
       Form::Sales::Pages::PersonWorkingSituation.new("person_3_working_situation", nil, self, person_index: 4),
       Form::Sales::Pages::PersonWorkingSituation.new("person_3_working_situation_joint_purchase", nil, self, person_index: 5),
       Form::Sales::Pages::PersonKnown.new("person_4_known", nil, self, person_index: 5),
@@ -61,6 +65,8 @@ class Form::Sales::Subsections::HouseholdCharacteristics < ::Form::Subsection
       Form::Sales::Pages::PersonRelationshipToBuyer1.new("person_4_relationship_to_buyer_1_joint_purchase", nil, self, person_index: 6),
       Form::Sales::Pages::PersonAge.new("person_4_age", nil, self, person_index: 5),
       Form::Sales::Pages::PersonAge.new("person_4_age_joint_purchase", nil, self, person_index: 6),
+      Form::Sales::Pages::PersonGenderIdentity.new("person_4_gender_identity", nil, self, person_index: 5),
+      Form::Sales::Pages::PersonGenderIdentity.new("person_4_gender_identity_joint_purchase", nil, self, person_index: 6),
       Form::Sales::Pages::PersonWorkingSituation.new("person_4_working_situation", nil, self, person_index: 5),
       Form::Sales::Pages::PersonWorkingSituation.new("person_4_working_situation_joint_purchase", nil, self, person_index: 6),
     ]
diff --git a/db/migrate/20221216122909_add_sexes_to_sales_log.rb b/db/migrate/20221216122909_add_sexes_to_sales_log.rb
new file mode 100644
index 000000000..41c1d16f4
--- /dev/null
+++ b/db/migrate/20221216122909_add_sexes_to_sales_log.rb
@@ -0,0 +1,9 @@
+class AddSexesToSalesLog < ActiveRecord::Migration[7.0]
+  def change
+    change_table :sales_logs, bulk: true do |t|
+      t.column :sex4, :string
+      t.column :sex5, :string
+      t.column :sex6, :string
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 8812128eb..9155a892f 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -463,6 +463,9 @@ ActiveRecord::Schema[7.0].define(version: 2023_01_05_103733) do
     t.integer "armedforcesspouse"
     t.integer "mscharge_known"
     t.decimal "mscharge", precision: 10, scale: 2
+    t.string "sex4"
+    t.string "sex5"
+    t.string "sex6"
     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 08f37b3bf..04cf7a94d 100644
--- a/spec/factories/sales_log.rb
+++ b/spec/factories/sales_log.rb
@@ -62,6 +62,9 @@ FactoryBot.define do
       savingsnk { 1 }
       prevown { 1 }
       sex3 { "X" }
+      sex4 { "X" }
+      sex5 { "X" }
+      sex6 { "X" }
       mortgage { 20_000 }
       ecstat3 { 10 }
       ecstat4 { 3 }
diff --git a/spec/models/form/sales/pages/person1_gender_identity_joint_purchase_spec.rb b/spec/models/form/sales/pages/person1_gender_identity_joint_purchase_spec.rb
deleted file mode 100644
index 94975b2e3..000000000
--- a/spec/models/form/sales/pages/person1_gender_identity_joint_purchase_spec.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-require "rails_helper"
-
-RSpec.describe Form::Sales::Pages::Person1GenderIdentityJointPurchase, type: :model do
-  subject(:page) { described_class.new(page_id, page_definition, subsection) }
-
-  let(:page_id) { nil }
-  let(:page_definition) { nil }
-  let(:subsection) { instance_double(Form::Subsection) }
-
-  it "has correct subsection" do
-    expect(page.subsection).to eq(subsection)
-  end
-
-  it "has correct questions" do
-    expect(page.questions.map(&:id)).to eq(%w[sex3])
-  end
-
-  it "has the correct id" do
-    expect(page.id).to eq("person_1_gender_identity_joint_purchase")
-  end
-
-  it "has the correct header" do
-    expect(page.header).to eq("")
-  end
-
-  it "has the correct description" do
-    expect(page.description).to eq("")
-  end
-
-  it "has correct depends_on" do
-    expect(page.depends_on).to eq([{ "details_known_1" => 1, "jointpur" => 1 }])
-  end
-end
diff --git a/spec/models/form/sales/pages/person1_gender_identity_spec.rb b/spec/models/form/sales/pages/person1_gender_identity_spec.rb
deleted file mode 100644
index ac63a1da7..000000000
--- a/spec/models/form/sales/pages/person1_gender_identity_spec.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-require "rails_helper"
-
-RSpec.describe Form::Sales::Pages::Person1GenderIdentity, type: :model do
-  subject(:page) { described_class.new(page_id, page_definition, subsection) }
-
-  let(:page_id) { nil }
-  let(:page_definition) { nil }
-  let(:subsection) { instance_double(Form::Subsection) }
-
-  it "has correct subsection" do
-    expect(page.subsection).to eq(subsection)
-  end
-
-  it "has correct questions" do
-    expect(page.questions.map(&:id)).to eq(%w[sex2])
-  end
-
-  it "has the correct id" do
-    expect(page.id).to eq("person_1_gender_identity")
-  end
-
-  it "has the correct header" do
-    expect(page.header).to eq("")
-  end
-
-  it "has the correct description" do
-    expect(page.description).to eq("")
-  end
-
-  it "has correct depends_on" do
-    expect(page.depends_on).to eq([{ "details_known_1" => 1, "jointpur" => 2 }])
-  end
-end
diff --git a/spec/models/form/sales/pages/person_gender_identity_spec.rb b/spec/models/form/sales/pages/person_gender_identity_spec.rb
new file mode 100644
index 000000000..0aefdd3f4
--- /dev/null
+++ b/spec/models/form/sales/pages/person_gender_identity_spec.rb
@@ -0,0 +1,178 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Pages::PersonGenderIdentity, type: :model do
+  subject(:page) { described_class.new(page_id, page_definition, subsection, person_index:) }
+
+  let(:page_definition) { nil }
+  let(:subsection) { instance_double(Form::Subsection) }
+  let(:person_index) { 1 }
+
+  context "without joint purchase" do
+    let(:page_id) { "person_1_working_situation" }
+
+    it "has correct subsection" do
+      expect(page.subsection).to eq(subsection)
+    end
+
+    it "has the correct header" do
+      expect(page.header).to eq("")
+    end
+
+    it "has the correct description" do
+      expect(page.description).to eq("")
+    end
+
+    context "with person 1" do
+      let(:person_index) { 2 }
+      let(:page_id) { "person_1_gender_identity" }
+
+      it "has correct questions" do
+        expect(page.questions.map(&:id)).to eq(%w[sex2])
+      end
+
+      it "has the correct id" do
+        expect(page.id).to eq("person_1_gender_identity")
+      end
+
+      it "has correct depends_on" do
+        expect(page.depends_on).to eq([{ "details_known_1" => 1, "jointpur" => 2 }])
+      end
+    end
+
+    context "with person 2" do
+      let(:person_index) { 3 }
+      let(:page_id) { "person_2_gender_identity" }
+
+      it "has correct questions" do
+        expect(page.questions.map(&:id)).to eq(%w[sex3])
+      end
+
+      it "has the correct id" do
+        expect(page.id).to eq("person_2_gender_identity")
+      end
+
+      it "has correct depends_on" do
+        expect(page.depends_on).to eq([{ "details_known_2" => 1, "jointpur" => 2 }])
+      end
+    end
+
+    context "with person 3" do
+      let(:person_index) { 4 }
+      let(:page_id) { "person_3_gender_identity" }
+
+      it "has correct questions" do
+        expect(page.questions.map(&:id)).to eq(%w[sex4])
+      end
+
+      it "has the correct id" do
+        expect(page.id).to eq("person_3_gender_identity")
+      end
+
+      it "has correct depends_on" do
+        expect(page.depends_on).to eq([{ "details_known_3" => 1, "jointpur" => 2 }])
+      end
+    end
+
+    context "with person 4" do
+      let(:person_index) { 5 }
+      let(:page_id) { "person_4_gender_identity" }
+
+      it "has correct questions" do
+        expect(page.questions.map(&:id)).to eq(%w[sex5])
+      end
+
+      it "has the correct id" do
+        expect(page.id).to eq("person_4_gender_identity")
+      end
+
+      it "has correct depends_on" do
+        expect(page.depends_on).to eq([{ "details_known_4" => 1, "jointpur" => 2 }])
+      end
+    end
+  end
+
+  context "with joint purchase" do
+    let(:page_id) { "person_1_gender_identity_joint_purchase" }
+
+    it "has correct subsection" do
+      expect(page.subsection).to eq(subsection)
+    end
+
+    it "has the correct header" do
+      expect(page.header).to eq("")
+    end
+
+    it "has the correct description" do
+      expect(page.description).to eq("")
+    end
+
+    context "with person 1" do
+      let(:person_index) { 3 }
+      let(:page_id) { "person_1_gender_identity_joint_purchase" }
+
+      it "has correct questions" do
+        expect(page.questions.map(&:id)).to eq(%w[sex3])
+      end
+
+      it "has the correct id" do
+        expect(page.id).to eq("person_1_gender_identity_joint_purchase")
+      end
+
+      it "has correct depends_on" do
+        expect(page.depends_on).to eq([{ "details_known_1" => 1, "jointpur" => 1 }])
+      end
+    end
+
+    context "with person 2" do
+      let(:person_index) { 4 }
+
+      let(:page_id) { "person_2_gender_identity_joint_purchase" }
+
+      it "has correct questions" do
+        expect(page.questions.map(&:id)).to eq(%w[sex4])
+      end
+
+      it "has the correct id" do
+        expect(page.id).to eq("person_2_gender_identity_joint_purchase")
+      end
+
+      it "has correct depends_on" do
+        expect(page.depends_on).to eq([{ "details_known_2" => 1, "jointpur" => 1 }])
+      end
+    end
+
+    context "with person 3" do
+      let(:person_index) { 5 }
+      let(:page_id) { "person_3_gender_identity_joint_purchase" }
+
+      it "has correct questions" do
+        expect(page.questions.map(&:id)).to eq(%w[sex5])
+      end
+
+      it "has the correct id" do
+        expect(page.id).to eq("person_3_gender_identity_joint_purchase")
+      end
+
+      it "has correct depends_on" do
+        expect(page.depends_on).to eq([{ "details_known_3" => 1, "jointpur" => 1 }])
+      end
+    end
+
+    context "with person 4" do
+      let(:person_index) { 6 }
+      let(:page_id) { "person_4_gender_identity_joint_purchase" }
+
+      it "has correct questions" do
+        expect(page.questions.map(&:id)).to eq(%w[sex6])
+      end
+
+      it "has the correct id" do
+        expect(page.id).to eq("person_4_gender_identity_joint_purchase")
+      end
+
+      it "has correct depends_on" do
+        expect(page.depends_on).to eq([{ "details_known_4" => 1, "jointpur" => 1 }])
+      end
+    end
+  end
+end
diff --git a/spec/models/form/sales/questions/person1_gender_identity_spec.rb b/spec/models/form/sales/questions/person1_gender_identity_spec.rb
deleted file mode 100644
index 9a4bc67cf..000000000
--- a/spec/models/form/sales/questions/person1_gender_identity_spec.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-require "rails_helper"
-
-RSpec.describe Form::Sales::Questions::Person1GenderIdentity, type: :model do
-  subject(:question) { described_class.new(question_id, question_definition, page) }
-
-  let(:question_id) { "sex2" }
-  let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
-
-  it "has correct page" do
-    expect(question.page).to eq(page)
-  end
-
-  it "has the correct id" do
-    expect(question.id).to eq("sex2")
-  end
-
-  it "has the correct header" do
-    expect(question.header).to eq("Which of these best describes Person 1’s gender identity?")
-  end
-
-  it "has the correct check_answer_label" do
-    expect(question.check_answer_label).to eq("Person 1’s gender identity")
-  end
-
-  it "has the correct type" do
-    expect(question.type).to eq("radio")
-  end
-
-  it "is not marked as derived" do
-    expect(question.derived?).to be false
-  end
-
-  it "has expected check answers card number" do
-    expect(question.check_answers_card_number).to eq(2)
-  end
-
-  it "has the correct answer_options" do
-    expect(question.answer_options).to eq({
-      "F" => { "value" => "Female" },
-      "M" => { "value" => "Male" },
-      "X" => { "value" => "Non-binary" },
-      "R" => { "value" => "Buyer prefers not to say" },
-    })
-  end
-end
diff --git a/spec/models/form/sales/questions/person_gender_identity_spec.rb b/spec/models/form/sales/questions/person_gender_identity_spec.rb
new file mode 100644
index 000000000..fb828addf
--- /dev/null
+++ b/spec/models/form/sales/questions/person_gender_identity_spec.rb
@@ -0,0 +1,247 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Questions::PersonGenderIdentity, type: :model do
+  subject(:question) { described_class.new(question_id, question_definition, page, person_index:) }
+
+  let(:question_id) { "sex2" }
+  let(:question_definition) { nil }
+  let(:page) { instance_double(Form::Page) }
+  let(:person_index) { 2 }
+
+  before do
+    allow(page).to receive(:id).and_return("person_1_gender_identity")
+  end
+
+  it "has correct page" do
+    expect(question.page).to eq(page)
+  end
+
+  it "has the correct type" do
+    expect(question.type).to eq("radio")
+  end
+
+  it "is not marked as derived" do
+    expect(question.derived?).to be false
+  end
+
+  it "has expected check answers card number" do
+    expect(question.check_answers_card_number).to eq(2)
+  end
+
+  it "has the correct answer_options" do
+    expect(question.answer_options).to eq({
+      "F" => { "value" => "Female" },
+      "M" => { "value" => "Male" },
+      "X" => { "value" => "Non-binary" },
+      "R" => { "value" => "Person prefers not to say" },
+    })
+  end
+
+  context "when person 1" do
+    context "and not joint purchase" do
+      let(:question_id) { "sex2" }
+      let(:person_index) { 2 }
+
+      before do
+        allow(page).to receive(:id).and_return("person_1_gender_identity")
+      end
+
+      it "has the correct id" do
+        expect(question.id).to eq("sex2")
+      end
+
+      it "has the correct header" do
+        expect(question.header).to eq("Which of these best describes Person 1’s gender identity?")
+      end
+
+      it "has the correct check_answer_label" do
+        expect(question.check_answer_label).to eq("Person 1’s gender identity")
+      end
+
+      it "has expected check answers card number" do
+        expect(question.check_answers_card_number).to eq(2)
+      end
+    end
+
+    context "and joint purchase" do
+      let(:person_index) { 3 }
+      let(:question_id) { "sex3" }
+
+      before do
+        allow(page).to receive(:id).and_return("person_1_gender_identity_joint_purchase")
+      end
+
+      it "has the correct id" do
+        expect(question.id).to eq("sex3")
+      end
+
+      it "has the correct header" do
+        expect(question.header).to eq("Which of these best describes Person 1’s gender identity?")
+      end
+
+      it "has the correct check_answer_label" do
+        expect(question.check_answer_label).to eq("Person 1’s gender identity")
+      end
+
+      it "has expected check answers card number" do
+        expect(question.check_answers_card_number).to eq(3)
+      end
+    end
+  end
+
+  context "when person 2" do
+    context "and not joint purchase" do
+      let(:question_id) { "sex3" }
+      let(:person_index) { 3 }
+
+      before do
+        allow(page).to receive(:id).and_return("person_2_gender_identity")
+      end
+
+      it "has the correct id" do
+        expect(question.id).to eq("sex3")
+      end
+
+      it "has the correct header" do
+        expect(question.header).to eq("Which of these best describes Person 2’s gender identity?")
+      end
+
+      it "has the correct check_answer_label" do
+        expect(question.check_answer_label).to eq("Person 2’s gender identity")
+      end
+
+      it "has expected check answers card number" do
+        expect(question.check_answers_card_number).to eq(3)
+      end
+    end
+
+    context "and joint purchase" do
+      let(:question_id) { "sex4" }
+      let(:person_index) { 4 }
+
+      before do
+        allow(page).to receive(:id).and_return("person_2_gender_identity_joint_purchase")
+      end
+
+      it "has the correct id" do
+        expect(question.id).to eq("sex4")
+      end
+
+      it "has the correct header" do
+        expect(question.header).to eq("Which of these best describes Person 2’s gender identity?")
+      end
+
+      it "has the correct check_answer_label" do
+        expect(question.check_answer_label).to eq("Person 2’s gender identity")
+      end
+
+      it "has expected check answers card number" do
+        expect(question.check_answers_card_number).to eq(4)
+      end
+    end
+  end
+
+  context "when person 3" do
+    context "and not joint purchase" do
+      let(:question_id) { "sex4" }
+      let(:person_index) { 4 }
+
+      before do
+        allow(page).to receive(:id).and_return("person_3_gender_identity")
+      end
+
+      it "has the correct id" do
+        expect(question.id).to eq("sex4")
+      end
+
+      it "has the correct header" do
+        expect(question.header).to eq("Which of these best describes Person 3’s gender identity?")
+      end
+
+      it "has the correct check_answer_label" do
+        expect(question.check_answer_label).to eq("Person 3’s gender identity")
+      end
+
+      it "has expected check answers card number" do
+        expect(question.check_answers_card_number).to eq(4)
+      end
+    end
+
+    context "and joint purchase" do
+      let(:question_id) { "sex5" }
+      let(:person_index) { 5 }
+
+      before do
+        allow(page).to receive(:id).and_return("person_3_gender_identity_joint_purchase")
+      end
+
+      it "has the correct id" do
+        expect(question.id).to eq("sex5")
+      end
+
+      it "has the correct header" do
+        expect(question.header).to eq("Which of these best describes Person 3’s gender identity?")
+      end
+
+      it "has the correct check_answer_label" do
+        expect(question.check_answer_label).to eq("Person 3’s gender identity")
+      end
+
+      it "has expected check answers card number" do
+        expect(question.check_answers_card_number).to eq(5)
+      end
+    end
+  end
+
+  context "when person 4" do
+    context "and not joint purchase" do
+      let(:question_id) { "sex5" }
+      let(:person_index) { 5 }
+
+      before do
+        allow(page).to receive(:id).and_return("person_4_gender_identity")
+      end
+
+      it "has the correct id" do
+        expect(question.id).to eq("sex5")
+      end
+
+      it "has the correct header" do
+        expect(question.header).to eq("Which of these best describes Person 4’s gender identity?")
+      end
+
+      it "has the correct check_answer_label" do
+        expect(question.check_answer_label).to eq("Person 4’s gender identity")
+      end
+
+      it "has expected check answers card number" do
+        expect(question.check_answers_card_number).to eq(5)
+      end
+    end
+
+    context "and joint purchase" do
+      let(:question_id) { "sex6" }
+      let(:person_index) { 6 }
+
+      before do
+        allow(page).to receive(:id).and_return("person_4_gender_identity_joint_purchase")
+      end
+
+      it "has the correct id" do
+        expect(question.id).to eq("sex6")
+      end
+
+      it "has the correct header" do
+        expect(question.header).to eq("Which of these best describes Person 4’s gender identity?")
+      end
+
+      it "has the correct check_answer_label" do
+        expect(question.check_answer_label).to eq("Person 4’s gender identity")
+      end
+
+      it "has expected check answers card number" do
+        expect(question.check_answers_card_number).to eq(6)
+      end
+    end
+  end
+end
diff --git a/spec/models/form/sales/subsections/household_characteristics_spec.rb b/spec/models/form/sales/subsections/household_characteristics_spec.rb
index ecdeca2dd..15c8be02f 100644
--- a/spec/models/form/sales/subsections/household_characteristics_spec.rb
+++ b/spec/models/form/sales/subsections/household_characteristics_spec.rb
@@ -50,6 +50,8 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model
         person_2_relationship_to_buyer_1_joint_purchase
         person_2_age
         person_2_age_joint_purchase
+        person_2_gender_identity
+        person_2_gender_identity_joint_purchase
         person_2_working_situation
         person_2_working_situation_joint_purchase
         person_3_known
@@ -58,6 +60,8 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model
         person_3_relationship_to_buyer_1_joint_purchase
         person_3_age
         person_3_age_joint_purchase
+        person_3_gender_identity
+        person_3_gender_identity_joint_purchase
         person_3_working_situation
         person_3_working_situation_joint_purchase
         person_4_known
@@ -66,6 +70,8 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model
         person_4_relationship_to_buyer_1_joint_purchase
         person_4_age
         person_4_age_joint_purchase
+        person_4_gender_identity
+        person_4_gender_identity_joint_purchase
         person_4_working_situation
         person_4_working_situation_joint_purchase
       ],
diff --git a/spec/models/form_handler_spec.rb b/spec/models/form_handler_spec.rb
index 4fef52c66..44ddbe3b8 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(125)
+      expect(form.pages.count).to eq(131)
       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(125)
+      expect(form.pages.count).to eq(131)
       expect(form.name).to eq("2021_2022_sales")
     end
   end