Change person_index to a named argument

app/models/form/sales/pages/person.rb

@@ -1,5 +1,5 @@
 class Form::Sales::Pages::Person < ::Form::Page
-  def initialize(id, hsh, subsection, person_index)
+  def initialize(id, hsh, subsection, person_index:)
     super(id, hsh, subsection)
     @person_index = person_index
   end

app/models/form/sales/pages/person_age.rb

@@ -1,5 +1,5 @@
 class Form::Sales::Pages::PersonAge < Form::Sales::Pages::Person
-  def initialize(id, hsh, subsection, person_index)
+  def initialize(id, hsh, subsection, person_index:)
     super
     @header = ""
     @description = ""
@@ -22,8 +22,8 @@ class Form::Sales::Pages::PersonAge < Form::Sales::Pages::Person
 
   def questions
     @questions ||= [
-      Form::Sales::Questions::PersonAgeKnown.new("age#{@person_index}_known", nil, self, @person_index),
-      Form::Sales::Questions::PersonAge.new("age#{@person_index}", nil, self, @person_index),
+      Form::Sales::Questions::PersonAgeKnown.new("age#{@person_index}_known", nil, self, person_index: @person_index),
+      Form::Sales::Questions::PersonAge.new("age#{@person_index}", nil, self, person_index: @person_index),
     ]
   end
 end

app/models/form/sales/pages/person_working_situation.rb

@@ -1,5 +1,5 @@
 class Form::Sales::Pages::PersonWorkingSituation < Form::Sales::Pages::Person
-  def initialize(id, hsh, subsection, person_index)
+  def initialize(id, hsh, subsection, person_index:)
     super
     @header = ""
     @description = ""
@@ -11,7 +11,7 @@ class Form::Sales::Pages::PersonWorkingSituation < Form::Sales::Pages::Person
 
   def questions
     @questions ||= [
-      Form::Sales::Questions::PersonWorkingSituation.new("ecstat#{@person_index}", nil, self, @person_index),
+      Form::Sales::Questions::PersonWorkingSituation.new("ecstat#{@person_index}", nil, self, person_index: @person_index),
     ]
   end
 end

app/models/form/sales/questions/person.rb

@@ -1,5 +1,5 @@
 class Form::Sales::Questions::Person < ::Form::Question
-  def initialize(id, hsh, page, person_index)
+  def initialize(id, hsh, page, person_index:)
     super(id, hsh, page)
     @person_index = person_index
   end

app/models/form/sales/questions/person_age.rb

@@ -1,5 +1,5 @@
 class Form::Sales::Questions::PersonAge < Form::Sales::Questions::Person
-  def initialize(id, hsh, page, person_index)
+  def initialize(id, hsh, page, person_index:)
     super
     @check_answer_label = "Person #{person_display_number}’s age"
     @header = "Age"

app/models/form/sales/questions/person_age_known.rb

@@ -1,5 +1,5 @@
 class Form::Sales::Questions::PersonAgeKnown < ::Form::Sales::Questions::Person
-  def initialize(id, hsh, page, person_index)
+  def initialize(id, hsh, page, person_index:)
     super
     @check_answer_label = "Person #{person_display_number}’s age known?"
     @header = "Do you know person #{person_display_number}’s age?"

app/models/form/sales/questions/person_working_situation.rb

@@ -1,5 +1,5 @@
 class Form::Sales::Questions::PersonWorkingSituation < ::Form::Sales::Questions::Person
-  def initialize(id, hsh, page, person_index)
+  def initialize(id, hsh, page, person_index:)
     super
     @check_answer_label = "Person #{person_display_number}’s working situation"
     @header = "Which of these best describes Person #{person_display_number}’s working situation?"

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

@@ -30,27 +30,27 @@ class Form::Sales::Subsections::HouseholdCharacteristics < ::Form::Subsection
       Form::Sales::Pages::Buyer2LiveInProperty.new(nil, nil, self),
       Form::Sales::Pages::NumberOfOthersInProperty.new(nil, nil, self),
       Form::Sales::Pages::Person1Known.new(nil, nil, self),
-      Form::Sales::Pages::PersonAge.new("person_1_age", nil, self, 2),
-      Form::Sales::Pages::PersonAge.new("person_1_age_joint_purchase", nil, self, 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::PersonWorkingSituation.new("person_1_working_situation", nil, self, 2),
-      Form::Sales::Pages::PersonWorkingSituation.new("person_1_working_situation_joint_purchase", nil, self, 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::Person2Known.new(nil, nil, self),
-      Form::Sales::Pages::PersonAge.new("person_2_age", nil, self, 3),
-      Form::Sales::Pages::PersonAge.new("person_2_age_joint_purchase", nil, self, 4),
-      Form::Sales::Pages::PersonWorkingSituation.new("person_2_working_situation", nil, self, 3),
-      Form::Sales::Pages::PersonWorkingSituation.new("person_2_working_situation_joint_purchase", nil, self, 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::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::Person3Known.new(nil, nil, self),
-      Form::Sales::Pages::PersonAge.new("person_3_age", nil, self, 4),
-      Form::Sales::Pages::PersonAge.new("person_3_age_joint_purchase", nil, self, 5),
-      Form::Sales::Pages::PersonWorkingSituation.new("person_3_working_situation", nil, self, 4),
-      Form::Sales::Pages::PersonWorkingSituation.new("person_3_working_situation_joint_purchase", nil, self, 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::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::Person4Known.new(nil, nil, self),
-      Form::Sales::Pages::PersonAge.new("person_4_age", nil, self, 5),
-      Form::Sales::Pages::PersonAge.new("person_4_age_joint_purchase", nil, self, 6),
-      Form::Sales::Pages::PersonWorkingSituation.new("person_4_working_situation", nil, self, 5),
-      Form::Sales::Pages::PersonWorkingSituation.new("person_4_working_situation_joint_purchase", nil, self, 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::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),
     ]
   end
 end

spec/models/form/sales/pages/person_age_spec.rb

@@ -1,7 +1,7 @@
 require "rails_helper"
 
 RSpec.describe Form::Sales::Pages::PersonAge, type: :model do
-  subject(:page) { described_class.new(page_id, page_definition, subsection, person_index) }
+  subject(:page) { described_class.new(page_id, page_definition, subsection, person_index:) }
 
   let(:page_id) { "person_1_age" }
   let(:page_definition) { nil }

spec/models/form/sales/pages/person_working_situation_spec.rb

@@ -1,7 +1,7 @@
 require "rails_helper"
 
 RSpec.describe Form::Sales::Pages::PersonWorkingSituation, type: :model do
-  subject(:page) { described_class.new(page_id, page_definition, subsection, person_index) }
+  subject(:page) { described_class.new(page_id, page_definition, subsection, person_index:) }
 
   let(:page_definition) { nil }
   let(:subsection) { instance_double(Form::Subsection) }

spec/models/form/sales/questions/person_age_known_spec.rb

@@ -1,7 +1,7 @@
 require "rails_helper"
 
 RSpec.describe Form::Sales::Questions::PersonAgeKnown, type: :model do
-  subject(:question) { described_class.new(question_id, question_definition, page, person_index) }
+  subject(:question) { described_class.new(question_id, question_definition, page, person_index:) }
 
   let(:question_id) { "age3_known" }
   let(:question_definition) { nil }

spec/models/form/sales/questions/person_age_spec.rb

@@ -1,7 +1,7 @@
 require "rails_helper"
 
 RSpec.describe Form::Sales::Questions::PersonAge, type: :model do
-  subject(:question) { described_class.new(question_id, question_definition, page, person_index) }
+  subject(:question) { described_class.new(question_id, question_definition, page, person_index:) }
 
   let(:question_id) { "age3" }
   let(:question_definition) { nil }

spec/models/form/sales/questions/person_working_situation_spec.rb

@@ -1,7 +1,7 @@
 require "rails_helper"
 
 RSpec.describe Form::Sales::Questions::PersonWorkingSituation, type: :model do
-  subject(:question) { described_class.new(question_id, question_definition, page, person_index) }
+  subject(:question) { described_class.new(question_id, question_definition, page, person_index:) }
 
   let(:question_id) { "ecstat2" }
   let(:question_definition) { nil }