From 6b4747b89bff853bee4b1b76a170d13274e8d149 Mon Sep 17 00:00:00 2001
From: Kat <katrina@kosiak.co.uk>
Date: Wed, 1 Feb 2023 14:09:32 +0000
Subject: [PATCH] Make person gender identity questions generic

---
 .../pages/lead_tenant_gender_identity.rb      |  2 +-
 .../pages/person_2_gender_identity.rb         | 13 ----
 .../pages/person_3_gender_identity.rb         | 13 ----
 .../pages/person_4_gender_identity.rb         | 13 ----
 .../pages/person_5_gender_identity.rb         | 13 ----
 .../pages/person_6_gender_identity.rb         | 13 ----
 .../pages/person_7_gender_identity.rb         | 13 ----
 .../pages/person_8_gender_identity.rb         | 13 ----
 .../lettings/pages/person_gender_identity.rb  | 14 +++++
 .../{sex1.rb => gender_identity1.rb}          |  2 +-
 .../questions/person_gender_identity.rb       | 14 +++++
 app/models/form/lettings/questions/sex2.rb    | 14 -----
 app/models/form/lettings/questions/sex3.rb    | 14 -----
 app/models/form/lettings/questions/sex4.rb    | 14 -----
 app/models/form/lettings/questions/sex5.rb    | 14 -----
 app/models/form/lettings/questions/sex6.rb    | 14 -----
 app/models/form/lettings/questions/sex7.rb    | 14 -----
 app/models/form/lettings/questions/sex8.rb    | 14 -----
 .../subsections/household_characteristics.rb  | 14 ++---
 .../pages/person_gender_identity_spec.rb      | 55 ++++++++++++++++
 .../questions/person_gender_identity_spec.rb  | 63 +++++++++++++++++++
 21 files changed, 155 insertions(+), 198 deletions(-)
 delete mode 100644 app/models/form/lettings/pages/person_2_gender_identity.rb
 delete mode 100644 app/models/form/lettings/pages/person_3_gender_identity.rb
 delete mode 100644 app/models/form/lettings/pages/person_4_gender_identity.rb
 delete mode 100644 app/models/form/lettings/pages/person_5_gender_identity.rb
 delete mode 100644 app/models/form/lettings/pages/person_6_gender_identity.rb
 delete mode 100644 app/models/form/lettings/pages/person_7_gender_identity.rb
 delete mode 100644 app/models/form/lettings/pages/person_8_gender_identity.rb
 create mode 100644 app/models/form/lettings/pages/person_gender_identity.rb
 rename app/models/form/lettings/questions/{sex1.rb => gender_identity1.rb} (91%)
 create mode 100644 app/models/form/lettings/questions/person_gender_identity.rb
 delete mode 100644 app/models/form/lettings/questions/sex2.rb
 delete mode 100644 app/models/form/lettings/questions/sex3.rb
 delete mode 100644 app/models/form/lettings/questions/sex4.rb
 delete mode 100644 app/models/form/lettings/questions/sex5.rb
 delete mode 100644 app/models/form/lettings/questions/sex6.rb
 delete mode 100644 app/models/form/lettings/questions/sex7.rb
 delete mode 100644 app/models/form/lettings/questions/sex8.rb
 create mode 100644 spec/models/form/lettings/pages/person_gender_identity_spec.rb
 create mode 100644 spec/models/form/lettings/questions/person_gender_identity_spec.rb

diff --git a/app/models/form/lettings/pages/lead_tenant_gender_identity.rb b/app/models/form/lettings/pages/lead_tenant_gender_identity.rb
index 232526e04..0bce9c97f 100644
--- a/app/models/form/lettings/pages/lead_tenant_gender_identity.rb
+++ b/app/models/form/lettings/pages/lead_tenant_gender_identity.rb
@@ -8,6 +8,6 @@ class Form::Lettings::Pages::LeadTenantGenderIdentity < ::Form::Page
   end
 
   def questions
-    @questions ||= [Form::Lettings::Questions::Sex1.new(nil, nil, self)]
+    @questions ||= [Form::Lettings::Questions::GenderIdentity1.new(nil, nil, self)]
   end
 end
diff --git a/app/models/form/lettings/pages/person_2_gender_identity.rb b/app/models/form/lettings/pages/person_2_gender_identity.rb
deleted file mode 100644
index 915a1256f..000000000
--- a/app/models/form/lettings/pages/person_2_gender_identity.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-class Form::Lettings::Pages::Person2GenderIdentity < ::Form::Page
-  def initialize(id, hsh, subsection)
-    super
-    @id = "person_2_gender_identity"
-    @header = ""
-    @depends_on = [{ "details_known_2" => 0 }]
-    @description = ""
-  end
-
-  def questions
-    @questions ||= [Form::Lettings::Questions::Sex2.new(nil, nil, self)]
-  end
-end
diff --git a/app/models/form/lettings/pages/person_3_gender_identity.rb b/app/models/form/lettings/pages/person_3_gender_identity.rb
deleted file mode 100644
index e80fc61ff..000000000
--- a/app/models/form/lettings/pages/person_3_gender_identity.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-class Form::Lettings::Pages::Person3GenderIdentity < ::Form::Page
-  def initialize(id, hsh, subsection)
-    super
-    @id = "person_3_gender_identity"
-    @header = ""
-    @depends_on = [{ "details_known_3" => 0 }]
-    @description = ""
-  end
-
-  def questions
-    @questions ||= [Form::Lettings::Questions::Sex3.new(nil, nil, self)]
-  end
-end
diff --git a/app/models/form/lettings/pages/person_4_gender_identity.rb b/app/models/form/lettings/pages/person_4_gender_identity.rb
deleted file mode 100644
index 86b54d2fc..000000000
--- a/app/models/form/lettings/pages/person_4_gender_identity.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-class Form::Lettings::Pages::Person4GenderIdentity < ::Form::Page
-  def initialize(id, hsh, subsection)
-    super
-    @id = "person_4_gender_identity"
-    @header = ""
-    @depends_on = [{ "details_known_4" => 0 }]
-    @description = ""
-  end
-
-  def questions
-    @questions ||= [Form::Lettings::Questions::Sex4.new(nil, nil, self)]
-  end
-end
diff --git a/app/models/form/lettings/pages/person_5_gender_identity.rb b/app/models/form/lettings/pages/person_5_gender_identity.rb
deleted file mode 100644
index 7c32e369d..000000000
--- a/app/models/form/lettings/pages/person_5_gender_identity.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-class Form::Lettings::Pages::Person5GenderIdentity < ::Form::Page
-  def initialize(id, hsh, subsection)
-    super
-    @id = "person_5_gender_identity"
-    @header = ""
-    @depends_on = [{ "details_known_5" => 0 }]
-    @description = ""
-  end
-
-  def questions
-    @questions ||= [Form::Lettings::Questions::Sex5.new(nil, nil, self)]
-  end
-end
diff --git a/app/models/form/lettings/pages/person_6_gender_identity.rb b/app/models/form/lettings/pages/person_6_gender_identity.rb
deleted file mode 100644
index eefe2b431..000000000
--- a/app/models/form/lettings/pages/person_6_gender_identity.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-class Form::Lettings::Pages::Person6GenderIdentity < ::Form::Page
-  def initialize(id, hsh, subsection)
-    super
-    @id = "person_6_gender_identity"
-    @header = ""
-    @depends_on = [{ "details_known_6" => 0 }]
-    @description = ""
-  end
-
-  def questions
-    @questions ||= [Form::Lettings::Questions::Sex6.new(nil, nil, self)]
-  end
-end
diff --git a/app/models/form/lettings/pages/person_7_gender_identity.rb b/app/models/form/lettings/pages/person_7_gender_identity.rb
deleted file mode 100644
index 1ab75d4b6..000000000
--- a/app/models/form/lettings/pages/person_7_gender_identity.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-class Form::Lettings::Pages::Person7GenderIdentity < ::Form::Page
-  def initialize(id, hsh, subsection)
-    super
-    @id = "person_7_gender_identity"
-    @header = ""
-    @depends_on = [{ "details_known_7" => 0 }]
-    @description = ""
-  end
-
-  def questions
-    @questions ||= [Form::Lettings::Questions::Sex7.new(nil, nil, self)]
-  end
-end
diff --git a/app/models/form/lettings/pages/person_8_gender_identity.rb b/app/models/form/lettings/pages/person_8_gender_identity.rb
deleted file mode 100644
index 9a71c5fde..000000000
--- a/app/models/form/lettings/pages/person_8_gender_identity.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-class Form::Lettings::Pages::Person8GenderIdentity < ::Form::Page
-  def initialize(id, hsh, subsection)
-    super
-    @id = "person_8_gender_identity"
-    @header = ""
-    @depends_on = [{ "details_known_8" => 0 }]
-    @description = ""
-  end
-
-  def questions
-    @questions ||= [Form::Lettings::Questions::Sex8.new(nil, nil, self)]
-  end
-end
diff --git a/app/models/form/lettings/pages/person_gender_identity.rb b/app/models/form/lettings/pages/person_gender_identity.rb
new file mode 100644
index 000000000..ada5f055f
--- /dev/null
+++ b/app/models/form/lettings/pages/person_gender_identity.rb
@@ -0,0 +1,14 @@
+class Form::Lettings::Pages::PersonGenderIdentity < ::Form::Page
+  def initialize(id, hsh, subsection, person_index:)
+    super(id, hsh, subsection)
+    @id = "person_#{person_index}_gender_identity"
+    @header = ""
+    @depends_on = [{ "details_known_#{person_index}" => 0 }]
+    @description = ""
+    @person_index = person_index
+  end
+
+  def questions
+    @questions ||= [Form::Lettings::Questions::PersonGenderIdentity.new(nil, nil, self, person_index: @person_index)]
+  end
+end
diff --git a/app/models/form/lettings/questions/sex1.rb b/app/models/form/lettings/questions/gender_identity1.rb
similarity index 91%
rename from app/models/form/lettings/questions/sex1.rb
rename to app/models/form/lettings/questions/gender_identity1.rb
index dc175f167..ca637a3bb 100644
--- a/app/models/form/lettings/questions/sex1.rb
+++ b/app/models/form/lettings/questions/gender_identity1.rb
@@ -1,4 +1,4 @@
-class Form::Lettings::Questions::Sex1 < ::Form::Question
+class Form::Lettings::Questions::GenderIdentity1 < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "sex1"
diff --git a/app/models/form/lettings/questions/person_gender_identity.rb b/app/models/form/lettings/questions/person_gender_identity.rb
new file mode 100644
index 000000000..131daf830
--- /dev/null
+++ b/app/models/form/lettings/questions/person_gender_identity.rb
@@ -0,0 +1,14 @@
+class Form::Lettings::Questions::PersonGenderIdentity < ::Form::Question
+  def initialize(id, hsh, page, person_index:)
+    super(id, hsh, page)
+    @id = "sex#{person_index}"
+    @check_answer_label = "Person #{person_index}’s gender identity"
+    @header = "Which of these best describes person #{person_index}’s gender identity?"
+    @type = "radio"
+    @check_answers_card_number = person_index
+    @hint_text = ""
+    @answer_options = ANSWER_OPTIONS
+  end
+
+  ANSWER_OPTIONS = { "F" => { "value" => "Female" }, "M" => { "value" => "Male" }, "X" => { "value" => "Non-binary" }, "divider" => { "value" => true }, "R" => { "value" => "Person prefers not to say" } }.freeze
+end
diff --git a/app/models/form/lettings/questions/sex2.rb b/app/models/form/lettings/questions/sex2.rb
deleted file mode 100644
index 5cc1ad468..000000000
--- a/app/models/form/lettings/questions/sex2.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-class Form::Lettings::Questions::Sex2 < ::Form::Question
-  def initialize(id, hsh, page)
-    super
-    @id = "sex2"
-    @check_answer_label = "Person 2’s gender identity"
-    @header = "Which of these best describes person 2’s gender identity?"
-    @type = "radio"
-    @check_answers_card_number = 2
-    @hint_text = ""
-    @answer_options = ANSWER_OPTIONS
-  end
-
-  ANSWER_OPTIONS = { "F" => { "value" => "Female" }, "M" => { "value" => "Male" }, "X" => { "value" => "Non-binary" }, "divider" => { "value" => true }, "R" => { "value" => "Person prefers not to say" } }.freeze
-end
diff --git a/app/models/form/lettings/questions/sex3.rb b/app/models/form/lettings/questions/sex3.rb
deleted file mode 100644
index 4f909b496..000000000
--- a/app/models/form/lettings/questions/sex3.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-class Form::Lettings::Questions::Sex3 < ::Form::Question
-  def initialize(id, hsh, page)
-    super
-    @id = "sex3"
-    @check_answer_label = "Person 3’s gender identity"
-    @header = "Which of these best describes person 3’s gender identity?"
-    @type = "radio"
-    @check_answers_card_number = 3
-    @hint_text = ""
-    @answer_options = ANSWER_OPTIONS
-  end
-
-  ANSWER_OPTIONS = { "F" => { "value" => "Female" }, "M" => { "value" => "Male" }, "X" => { "value" => "Non-binary" }, "divider" => { "value" => true }, "R" => { "value" => "Person prefers not to say" } }.freeze
-end
diff --git a/app/models/form/lettings/questions/sex4.rb b/app/models/form/lettings/questions/sex4.rb
deleted file mode 100644
index a81072579..000000000
--- a/app/models/form/lettings/questions/sex4.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-class Form::Lettings::Questions::Sex4 < ::Form::Question
-  def initialize(id, hsh, page)
-    super
-    @id = "sex4"
-    @check_answer_label = "Person 4’s gender identity"
-    @header = "Which of these best describes person 4’s gender identity?"
-    @type = "radio"
-    @check_answers_card_number = 4
-    @hint_text = ""
-    @answer_options = ANSWER_OPTIONS
-  end
-
-  ANSWER_OPTIONS = { "F" => { "value" => "Female" }, "M" => { "value" => "Male" }, "X" => { "value" => "Non-binary" }, "divider" => { "value" => true }, "R" => { "value" => "Person prefers not to say" } }.freeze
-end
diff --git a/app/models/form/lettings/questions/sex5.rb b/app/models/form/lettings/questions/sex5.rb
deleted file mode 100644
index be1572274..000000000
--- a/app/models/form/lettings/questions/sex5.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-class Form::Lettings::Questions::Sex5 < ::Form::Question
-  def initialize(id, hsh, page)
-    super
-    @id = "sex5"
-    @check_answer_label = "Person 5’s gender identity"
-    @header = "Which of these best describes person 5’s gender identity?"
-    @type = "radio"
-    @check_answers_card_number = 5
-    @hint_text = ""
-    @answer_options = ANSWER_OPTIONS
-  end
-
-  ANSWER_OPTIONS = { "F" => { "value" => "Female" }, "M" => { "value" => "Male" }, "X" => { "value" => "Non-binary" }, "divider" => { "value" => true }, "R" => { "value" => "Person prefers not to say" } }.freeze
-end
diff --git a/app/models/form/lettings/questions/sex6.rb b/app/models/form/lettings/questions/sex6.rb
deleted file mode 100644
index a494dc0a5..000000000
--- a/app/models/form/lettings/questions/sex6.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-class Form::Lettings::Questions::Sex6 < ::Form::Question
-  def initialize(id, hsh, page)
-    super
-    @id = "sex6"
-    @check_answer_label = "Person 6’s gender identity"
-    @header = "Which of these best describes person 6’s gender identity?"
-    @type = "radio"
-    @check_answers_card_number = 6
-    @hint_text = ""
-    @answer_options = ANSWER_OPTIONS
-  end
-
-  ANSWER_OPTIONS = { "F" => { "value" => "Female" }, "M" => { "value" => "Male" }, "X" => { "value" => "Non-binary" }, "divider" => { "value" => true }, "R" => { "value" => "Person prefers not to say" } }.freeze
-end
diff --git a/app/models/form/lettings/questions/sex7.rb b/app/models/form/lettings/questions/sex7.rb
deleted file mode 100644
index baa0d356e..000000000
--- a/app/models/form/lettings/questions/sex7.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-class Form::Lettings::Questions::Sex7 < ::Form::Question
-  def initialize(id, hsh, page)
-    super
-    @id = "sex7"
-    @check_answer_label = "Person 7’s gender identity"
-    @header = "Which of these best describes person 7’s gender identity?"
-    @type = "radio"
-    @check_answers_card_number = 7
-    @hint_text = ""
-    @answer_options = ANSWER_OPTIONS
-  end
-
-  ANSWER_OPTIONS = { "F" => { "value" => "Female" }, "M" => { "value" => "Male" }, "X" => { "value" => "Non-binary" }, "divider" => { "value" => true }, "R" => { "value" => "Person prefers not to say" } }.freeze
-end
diff --git a/app/models/form/lettings/questions/sex8.rb b/app/models/form/lettings/questions/sex8.rb
deleted file mode 100644
index 0c4e00c18..000000000
--- a/app/models/form/lettings/questions/sex8.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-class Form::Lettings::Questions::Sex8 < ::Form::Question
-  def initialize(id, hsh, page)
-    super
-    @id = "sex8"
-    @check_answer_label = "Person 8’s gender identity"
-    @header = "Which of these best describes person 8’s gender identity?"
-    @type = "radio"
-    @check_answers_card_number = 8
-    @hint_text = ""
-    @answer_options = ANSWER_OPTIONS
-  end
-
-  ANSWER_OPTIONS = { "F" => { "value" => "Female" }, "M" => { "value" => "Male" }, "X" => { "value" => "Non-binary" }, "divider" => { "value" => true }, "R" => { "value" => "Person prefers not to say" } }.freeze
-end
diff --git a/app/models/form/lettings/subsections/household_characteristics.rb b/app/models/form/lettings/subsections/household_characteristics.rb
index 32ed1303f..c5f2615c9 100644
--- a/app/models/form/lettings/subsections/household_characteristics.rb
+++ b/app/models/form/lettings/subsections/household_characteristics.rb
@@ -32,7 +32,7 @@ class Form::Lettings::Subsections::HouseholdCharacteristics < ::Form::Subsection
                 Form::Lettings::Pages::PersonAge.new(nil, nil, self, person_index: 2),
                 Form::Lettings::Pages::NoFemalesPregnantHouseholdPerson2AgeValueCheck.new(nil, nil, self),
                 Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdPerson2AgeValueCheck.new(nil, nil, self),
-                Form::Lettings::Pages::Person2GenderIdentity.new(nil, nil, self),
+                Form::Lettings::Pages::PersonGenderIdentity.new(nil, nil, self, person_index: 2),
                 Form::Lettings::Pages::NoFemalesPregnantHouseholdPerson2ValueCheck.new(nil, nil, self),
                 Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdPerson2ValueCheck.new(nil, nil, self),
                 Form::Lettings::Pages::Person2WorkingSituation.new(nil, nil, self),
@@ -43,7 +43,7 @@ class Form::Lettings::Subsections::HouseholdCharacteristics < ::Form::Subsection
                 Form::Lettings::Pages::PersonAge.new(nil, nil, self, person_index: 3),
                 Form::Lettings::Pages::NoFemalesPregnantHouseholdPerson3AgeValueCheck.new(nil, nil, self),
                 Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdPerson3AgeValueCheck.new(nil, nil, self),
-                Form::Lettings::Pages::Person3GenderIdentity.new(nil, nil, self),
+                Form::Lettings::Pages::PersonGenderIdentity.new(nil, nil, self, person_index: 3),
                 Form::Lettings::Pages::NoFemalesPregnantHouseholdPerson3ValueCheck.new(nil, nil, self),
                 Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdPerson3ValueCheck.new(nil, nil, self),
                 Form::Lettings::Pages::Person3WorkingSituation.new(nil, nil, self),
@@ -54,7 +54,7 @@ class Form::Lettings::Subsections::HouseholdCharacteristics < ::Form::Subsection
                 Form::Lettings::Pages::PersonAge.new(nil, nil, self, person_index: 4),
                 Form::Lettings::Pages::NoFemalesPregnantHouseholdPerson4AgeValueCheck.new(nil, nil, self),
                 Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdPerson4AgeValueCheck.new(nil, nil, self),
-                Form::Lettings::Pages::Person4GenderIdentity.new(nil, nil, self),
+                Form::Lettings::Pages::PersonGenderIdentity.new(nil, nil, self, person_index: 4),
                 Form::Lettings::Pages::NoFemalesPregnantHouseholdPerson4ValueCheck.new(nil, nil, self),
                 Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdPerson4ValueCheck.new(nil, nil, self),
                 Form::Lettings::Pages::Person4WorkingSituation.new(nil, nil, self),
@@ -65,7 +65,7 @@ class Form::Lettings::Subsections::HouseholdCharacteristics < ::Form::Subsection
                 Form::Lettings::Pages::PersonAge.new(nil, nil, self, person_index: 5),
                 Form::Lettings::Pages::NoFemalesPregnantHouseholdPerson5AgeValueCheck.new(nil, nil, self),
                 Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdPerson5AgeValueCheck.new(nil, nil, self),
-                Form::Lettings::Pages::Person5GenderIdentity.new(nil, nil, self),
+                Form::Lettings::Pages::PersonGenderIdentity.new(nil, nil, self, person_index: 5),
                 Form::Lettings::Pages::NoFemalesPregnantHouseholdPerson5ValueCheck.new(nil, nil, self),
                 Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdPerson5ValueCheck.new(nil, nil, self),
                 Form::Lettings::Pages::Person5WorkingSituation.new(nil, nil, self),
@@ -76,7 +76,7 @@ class Form::Lettings::Subsections::HouseholdCharacteristics < ::Form::Subsection
                 Form::Lettings::Pages::PersonAge.new(nil, nil, self, person_index: 6),
                 Form::Lettings::Pages::NoFemalesPregnantHouseholdPerson6AgeValueCheck.new(nil, nil, self),
                 Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdPerson6AgeValueCheck.new(nil, nil, self),
-                Form::Lettings::Pages::Person6GenderIdentity.new(nil, nil, self),
+                Form::Lettings::Pages::PersonGenderIdentity.new(nil, nil, self, person_index: 6),
                 Form::Lettings::Pages::NoFemalesPregnantHouseholdPerson6ValueCheck.new(nil, nil, self),
                 Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdPerson6ValueCheck.new(nil, nil, self),
                 Form::Lettings::Pages::Person6WorkingSituation.new(nil, nil, self),
@@ -87,7 +87,7 @@ class Form::Lettings::Subsections::HouseholdCharacteristics < ::Form::Subsection
                 Form::Lettings::Pages::PersonAge.new(nil, nil, self, person_index: 7),
                 Form::Lettings::Pages::NoFemalesPregnantHouseholdPerson7AgeValueCheck.new(nil, nil, self),
                 Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdPerson7AgeValueCheck.new(nil, nil, self),
-                Form::Lettings::Pages::Person7GenderIdentity.new(nil, nil, self),
+                Form::Lettings::Pages::PersonGenderIdentity.new(nil, nil, self, person_index: 7),
                 Form::Lettings::Pages::NoFemalesPregnantHouseholdPerson7ValueCheck.new(nil, nil, self),
                 Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdPerson7ValueCheck.new(nil, nil, self),
                 Form::Lettings::Pages::Person7WorkingSituation.new(nil, nil, self),
@@ -98,7 +98,7 @@ class Form::Lettings::Subsections::HouseholdCharacteristics < ::Form::Subsection
                 Form::Lettings::Pages::PersonAge.new(nil, nil, self, person_index: 8),
                 Form::Lettings::Pages::NoFemalesPregnantHouseholdPerson8AgeValueCheck.new(nil, nil, self),
                 Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdPerson8AgeValueCheck.new(nil, nil, self),
-                Form::Lettings::Pages::Person8GenderIdentity.new(nil, nil, self),
+                Form::Lettings::Pages::PersonGenderIdentity.new(nil, nil, self, person_index: 8),
                 Form::Lettings::Pages::NoFemalesPregnantHouseholdPerson8ValueCheck.new(nil, nil, self),
                 Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdPerson8ValueCheck.new(nil, nil, self),
                 Form::Lettings::Pages::Person8WorkingSituation.new(nil, nil, self),
diff --git a/spec/models/form/lettings/pages/person_gender_identity_spec.rb b/spec/models/form/lettings/pages/person_gender_identity_spec.rb
new file mode 100644
index 000000000..14138487f
--- /dev/null
+++ b/spec/models/form/lettings/pages/person_gender_identity_spec.rb
@@ -0,0 +1,55 @@
+require "rails_helper"
+
+RSpec.describe Form::Lettings::Pages::PersonGenderIdentity, type: :model do
+  subject(:page) { described_class.new(nil, page_definition, subsection, person_index:) }
+
+  let(:page_definition) { nil }
+  let(:subsection) { instance_double(Form::Subsection) }
+  let(:person_index) { 2 }
+
+  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 2" do
+    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_2_gender_identity")
+    end
+
+    it "has correct depends_on" do
+      expect(page.depends_on).to eq(
+        [{ "details_known_2" => 0 }],
+      )
+    end
+  end
+
+  context "with person 3" do
+    let(:person_index) { 3 }
+
+    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_3_gender_identity")
+    end
+
+    it "has correct depends_on" do
+      expect(page.depends_on).to eq(
+        [{ "details_known_3" => 0 }],
+      )
+    end
+  end
+end
diff --git a/spec/models/form/lettings/questions/person_gender_identity_spec.rb b/spec/models/form/lettings/questions/person_gender_identity_spec.rb
new file mode 100644
index 000000000..703ba764a
--- /dev/null
+++ b/spec/models/form/lettings/questions/person_gender_identity_spec.rb
@@ -0,0 +1,63 @@
+require "rails_helper"
+
+RSpec.describe Form::Lettings::Questions::PersonGenderIdentity, type: :model do
+  subject(:question) { described_class.new(nil, question_definition, page, person_index:) }
+
+  let(:question_definition) { nil }
+  let(:page) { instance_double(Form::Page) }
+  let(:person_index) { 2 }
+
+  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 the correct hint" do
+    expect(question.hint_text).to eq("")
+  end
+
+  context "with person 2" do
+    it "has the correct id" do
+      expect(question.id).to eq("sex2")
+    end
+
+    it "has the correct check_answer_label" do
+      expect(question.check_answer_label).to eq("Person 2’s gender identity")
+    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_answers_card_number" do
+      expect(question.check_answers_card_number).to eq(2)
+    end
+  end
+
+  context "with person 3" do
+    let(:person_index) { 3 }
+
+    it "has the correct id" do
+      expect(question.id).to eq("sex3")
+    end
+
+    it "has the correct check_answer_label" do
+      expect(question.check_answer_label).to eq("Person 3’s gender identity")
+    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_answers_card_number" do
+      expect(question.check_answers_card_number).to eq(3)
+    end
+  end
+end