From 119b6590c9b726a645a7dd6e05e5e7aa2f320114 Mon Sep 17 00:00:00 2001 From: Kat Date: Thu, 4 May 2023 08:22:08 +0100 Subject: [PATCH] Fix the retirement check showing on the card 8, fix tests --- .../pages/lead_tenant_over_retirement_value_check.rb | 2 +- .../pages/lead_tenant_under_retirement_value_check.rb | 2 +- .../lettings/pages/person_over_retirement_value_check.rb | 2 +- .../lettings/pages/person_under_retirement_value_check.rb | 2 +- .../form/lettings/questions/no_retirement_value_check.rb | 6 +++--- .../form/lettings/questions/retirement_value_check.rb | 6 +++--- .../form/lettings/pages/net_income_value_check_spec.rb | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/models/form/lettings/pages/lead_tenant_over_retirement_value_check.rb b/app/models/form/lettings/pages/lead_tenant_over_retirement_value_check.rb index d2651d83d..ca6183f3c 100644 --- a/app/models/form/lettings/pages/lead_tenant_over_retirement_value_check.rb +++ b/app/models/form/lettings/pages/lead_tenant_over_retirement_value_check.rb @@ -27,7 +27,7 @@ class Form::Lettings::Pages::LeadTenantOverRetirementValueCheck < ::Form::Page end def questions - @questions ||= [Form::Lettings::Questions::RetirementValueCheck.new(nil, nil, self)] + @questions ||= [Form::Lettings::Questions::RetirementValueCheck.new(nil, nil, self, person_index: 1)] end def interruption_screen_question_ids diff --git a/app/models/form/lettings/pages/lead_tenant_under_retirement_value_check.rb b/app/models/form/lettings/pages/lead_tenant_under_retirement_value_check.rb index ab6f5bb01..b7ab02900 100644 --- a/app/models/form/lettings/pages/lead_tenant_under_retirement_value_check.rb +++ b/app/models/form/lettings/pages/lead_tenant_under_retirement_value_check.rb @@ -17,7 +17,7 @@ class Form::Lettings::Pages::LeadTenantUnderRetirementValueCheck < ::Form::Page end def questions - @questions ||= [Form::Lettings::Questions::NoRetirementValueCheck.new(nil, nil, self)] + @questions ||= [Form::Lettings::Questions::NoRetirementValueCheck.new(nil, nil, self, person_index: 1)] end def interruption_screen_question_ids diff --git a/app/models/form/lettings/pages/person_over_retirement_value_check.rb b/app/models/form/lettings/pages/person_over_retirement_value_check.rb index 4153ff94e..b13a52ed5 100644 --- a/app/models/form/lettings/pages/person_over_retirement_value_check.rb +++ b/app/models/form/lettings/pages/person_over_retirement_value_check.rb @@ -32,7 +32,7 @@ class Form::Lettings::Pages::PersonOverRetirementValueCheck < ::Form::Page end def questions - @questions ||= [Form::Lettings::Questions::RetirementValueCheck.new(nil, nil, self)] + @questions ||= [Form::Lettings::Questions::RetirementValueCheck.new(nil, nil, self, person_index: @person_index)] end def interruption_screen_question_ids diff --git a/app/models/form/lettings/pages/person_under_retirement_value_check.rb b/app/models/form/lettings/pages/person_under_retirement_value_check.rb index 375eedefb..9f7540f56 100644 --- a/app/models/form/lettings/pages/person_under_retirement_value_check.rb +++ b/app/models/form/lettings/pages/person_under_retirement_value_check.rb @@ -18,7 +18,7 @@ class Form::Lettings::Pages::PersonUnderRetirementValueCheck < ::Form::Page end def questions - @questions ||= [Form::Lettings::Questions::NoRetirementValueCheck.new(nil, nil, self)] + @questions ||= [Form::Lettings::Questions::NoRetirementValueCheck.new(nil, nil, self, person_index: @person_index)] end def interruption_screen_question_ids diff --git a/app/models/form/lettings/questions/no_retirement_value_check.rb b/app/models/form/lettings/questions/no_retirement_value_check.rb index 43fe68e10..0e2033c61 100644 --- a/app/models/form/lettings/questions/no_retirement_value_check.rb +++ b/app/models/form/lettings/questions/no_retirement_value_check.rb @@ -1,11 +1,11 @@ class Form::Lettings::Questions::NoRetirementValueCheck < ::Form::Question - def initialize(id, hsh, page) - super + def initialize(id, hsh, page, person_index:) + super(id, hsh, page) @id = "retirement_value_check" @check_answer_label = "Retirement confirmation" @header = "Are you sure this person is retired?" @type = "interruption_screen" - @check_answers_card_number = 8 + @check_answers_card_number = person_index @answer_options = ANSWER_OPTIONS @hidden_in_check_answers = { "depends_on" => [ diff --git a/app/models/form/lettings/questions/retirement_value_check.rb b/app/models/form/lettings/questions/retirement_value_check.rb index 784693616..63a286d61 100644 --- a/app/models/form/lettings/questions/retirement_value_check.rb +++ b/app/models/form/lettings/questions/retirement_value_check.rb @@ -1,11 +1,11 @@ class Form::Lettings::Questions::RetirementValueCheck < ::Form::Question - def initialize(id, hsh, page) - super + def initialize(id, hsh, page, person_index:) + super(id, hsh, page) @id = "retirement_value_check" @check_answer_label = "Retirement confirmation" @header = "Are you sure this person isn’t retired?" @type = "interruption_screen" - @check_answers_card_number = 8 + @check_answers_card_number = person_index @answer_options = ANSWER_OPTIONS @hidden_in_check_answers = { "depends_on" => [ diff --git a/spec/models/form/lettings/pages/net_income_value_check_spec.rb b/spec/models/form/lettings/pages/net_income_value_check_spec.rb index 08a9c731c..f07ec84ab 100644 --- a/spec/models/form/lettings/pages/net_income_value_check_spec.rb +++ b/spec/models/form/lettings/pages/net_income_value_check_spec.rb @@ -28,12 +28,12 @@ RSpec.describe Form::Lettings::Pages::NetIncomeValueCheck, type: :model do end it "has the correct title_text" do - expect(page.title_text).to eq({ "translation" => "soft_validations.net_income.title_text" }) + expect(page.title_text).to eq({ "translation" => "soft_validations.net_income.title_text", "arguments" => [{ "i18n_template" => "incfreq", "key" => "incfreq", "label" => true }, { "arguments_for_key" => "earnings", "i18n_template" => "earnings", "key" => "field_formatted_as_currency" }] }) end it "has the correct informative_text" do expect(page.informative_text).to eq({ - "arguments" => [{ "label" => true, "i18n_template" => "ecstat1", "key" => "ecstat1" }, { "arguments_for_key" => "earnings", "i18n_template" => "earnings", "key" => "field_formatted_as_currency" }], + "arguments" => [{ "i18n_template" => "net_income_higher_or_lower_text", "key" => "net_income_higher_or_lower_text", "label" => false }], "translation" => "soft_validations.net_income.hint_text", }) end