feat: add combined validation everywhere and add tests

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

@@ -1,9 +1,6 @@
 class Form::Sales::Pages::Buyer2IncomeMinValueCheck < ::Form::Page
   def initialize(id, hsh, subsection)
     super
-    @header = ""
-    @description = ""
-    @subsection = subsection
     @depends_on = [
       {
         "income2_under_soft_min?" => true,

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

@@ -1,5 +1,5 @@
 class Form::Sales::Pages::CombinedIncomeMaxValueCheck < ::Form::Page
-  def initialize(id, hsh, subsection, buyer_index:)
+  def initialize(id, hsh, subsection, check_answers_card_number:)
     super(id, hsh, subsection)
     @depends_on = [
       {
@@ -17,12 +17,12 @@ class Form::Sales::Pages::CombinedIncomeMaxValueCheck < ::Form::Page
       ],
     }
     @informative_text = {}
-    @buyer_index = buyer_index
+    @check_answers_card_number = check_answers_card_number
   end
 
   def questions
     @questions ||= [
-      Form::Sales::Questions::CombinedIncomeValueCheck.new(nil, nil, self, buyer_index: @buyer_index),
+      Form::Sales::Questions::CombinedIncomeValueCheck.new(nil, nil, self, check_answers_card_number: @check_answers_card_number),
     ]
   end
 end

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

@@ -1,5 +1,5 @@
 class Form::Sales::Questions::CombinedIncomeValueCheck < ::Form::Question
-  def initialize(id, hsh, page, buyer_index:)
+  def initialize(id, hsh, page, check_answers_card_number:)
     super(id, hsh, page)
     @id = "combined_income_value_check"
     @check_answer_label = "Combined income confirmation"
@@ -19,7 +19,7 @@ class Form::Sales::Questions::CombinedIncomeValueCheck < ::Form::Question
         },
       ],
     }
-    @check_answers_card_number = buyer_index
+    @check_answers_card_number = check_answers_card_number
     @page = page
   end
 end

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

@@ -11,7 +11,7 @@ class Form::Sales::Subsections::IncomeBenefitsAndSavings < ::Form::Subsection
       Form::Sales::Pages::Buyer1Income.new(nil, nil, self),
       Form::Sales::Pages::Buyer1IncomeMinValueCheck.new("buyer_1_income_min_value_check", nil, self),
       Form::Sales::Pages::Buyer1IncomeMaxValueCheck.new("buyer_1_income_max_value_check", nil, self),
-      Form::Sales::Pages::CombinedIncomeMaxValueCheck.new("buyer_1_combined_income_max_value_check", nil, self, buyer_index: 1),
+      Form::Sales::Pages::CombinedIncomeMaxValueCheck.new("buyer_1_combined_income_max_value_check", nil, self, check_answers_card_number: 1),
       Form::Sales::Pages::MortgageValueCheck.new("buyer_1_income_mortgage_value_check", nil, self, 1),
       Form::Sales::Pages::Buyer1Mortgage.new(nil, nil, self),
       Form::Sales::Pages::MortgageValueCheck.new("buyer_1_mortgage_value_check", nil, self, 1),
@@ -19,7 +19,7 @@ class Form::Sales::Subsections::IncomeBenefitsAndSavings < ::Form::Subsection
       Form::Sales::Pages::MortgageValueCheck.new("buyer_2_income_mortgage_value_check", nil, self, 2),
       Form::Sales::Pages::Buyer2IncomeMinValueCheck.new("buyer_2_income_min_value_check", nil, self),
       Form::Sales::Pages::Buyer2IncomeMaxValueCheck.new("buyer_2_income_max_value_check", nil, self),
-      Form::Sales::Pages::CombinedIncomeMaxValueCheck.new("buyer_2_combined_income_max_value_check", nil, self, buyer_index: 2),
+      Form::Sales::Pages::CombinedIncomeMaxValueCheck.new("buyer_2_combined_income_max_value_check", nil, self, check_answers_card_number: 2),
       Form::Sales::Pages::Buyer2Mortgage.new(nil, nil, self),
       Form::Sales::Pages::MortgageValueCheck.new("buyer_2_mortgage_value_check", nil, self, 2),
       Form::Sales::Pages::HousingBenefits.new("housing_benefits_joint_purchase", nil, self, joint_purchase: true),

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

@@ -30,6 +30,7 @@ class Form::Sales::Subsections::PropertyInformation < ::Form::Subsection
         Form::Sales::Pages::PropertyLocalAuthority.new(nil, nil, self),
         Form::Sales::Pages::Buyer1IncomeMaxValueCheck.new("local_authority_buyer_1_income_max_value_check", nil, self),
         Form::Sales::Pages::Buyer2IncomeMaxValueCheck.new("local_authority_buyer_2_income_max_value_check", nil, self),
+        Form::Sales::Pages::CombinedIncomeMaxValueCheck.new("local_authority_combined_income_max_value_check", nil, self, check_answers_card_number: nil),
       ]
     end
   end
@@ -41,6 +42,7 @@ class Form::Sales::Subsections::PropertyInformation < ::Form::Subsection
         Form::Sales::Pages::PropertyLocalAuthority.new(nil, nil, self),
         Form::Sales::Pages::Buyer1IncomeMaxValueCheck.new("local_authority_buyer_1_income_max_value_check", nil, self),
         Form::Sales::Pages::Buyer2IncomeMaxValueCheck.new("local_authority_buyer_2_income_max_value_check", nil, self),
+        Form::Sales::Pages::CombinedIncomeMaxValueCheck.new("local_authority_combined_income_max_value_check", nil, self, check_answers_card_number: nil),
       ]
     end
   end

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

@@ -0,0 +1,37 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Pages::Buyer2IncomeMaxValueCheck, type: :model do
+  subject(:page) { described_class.new(page_id, page_definition, subsection) }
+
+  let(:page_id) { "prefix_buyer_2_income_max_value_check" }
+  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[income2_value_check])
+  end
+
+  it "has the correct id" do
+    expect(page.id).to eq("prefix_buyer_2_income_max_value_check")
+  end
+
+  it "has the correct header" do
+    expect(page.header).to be_nil
+  end
+
+  it "has correct depends_on" do
+    expect(page.depends_on).to eq([
+      {
+        "income2_over_soft_max?" => true,
+      },
+    ])
+  end
+
+  it "is interruption screen page" do
+    expect(page.interruption_screen?).to eq(true)
+  end
+end

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

@@ -0,0 +1,37 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Pages::Buyer2IncomeMinValueCheck, type: :model do
+  subject(:page) { described_class.new(page_id, page_definition, subsection) }
+
+  let(:page_id) { "prefix_buyer_2_income_min_value_check" }
+  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[income2_value_check])
+  end
+
+  it "has the correct id" do
+    expect(page.id).to eq("prefix_buyer_2_income_min_value_check")
+  end
+
+  it "has the correct header" do
+    expect(page.header).to be_nil
+  end
+
+  it "has correct depends_on" do
+    expect(page.depends_on).to eq([
+      {
+        "income2_under_soft_min?" => true,
+      },
+    ])
+  end
+
+  it "is interruption screen page" do
+    expect(page.interruption_screen?).to eq(true)
+  end
+end

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

@@ -0,0 +1,37 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Pages::CombinedIncomeMaxValueCheck, type: :model do
+  subject(:page) { described_class.new(page_id, page_definition, subsection, check_answers_card_number: nil) }
+
+  let(:page_id) { "prefix_combined_income_max_value_check" }
+  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[combined_income_value_check])
+  end
+
+  it "has the correct id" do
+    expect(page.id).to eq("prefix_combined_income_max_value_check")
+  end
+
+  it "has the correct header" do
+    expect(page.header).to be_nil
+  end
+
+  it "has correct depends_on" do
+    expect(page.depends_on).to eq([
+      {
+        "combined_income_over_soft_max?" => true,
+      },
+    ])
+  end
+
+  it "is interruption screen page" do
+    expect(page.interruption_screen?).to eq(true)
+  end
+end