From 13ef49d95da94e3b6fed5988a28784cdad367e39 Mon Sep 17 00:00:00 2001 From: Kat Date: Thu, 8 Dec 2022 08:47:02 +0000 Subject: [PATCH] Hide age known question in check answers if it is answered yes or no --- app/models/form/sales/questions/buyer1_age_known.rb | 12 +++++++++++- app/models/form/sales/questions/buyer2_age_known.rb | 10 ++++++++++ .../form/sales/questions/person1_age_known.rb | 3 +++ .../form/sales/questions/person2_age_known.rb | 7 ++----- .../form/sales/questions/person3_age_known.rb | 7 ++----- .../form/sales/questions/person4_age_known.rb | 7 ++----- .../form/sales/questions/buyer1_age_known_spec.rb | 13 ++++++++++++- .../form/sales/questions/buyer2_age_known_spec.rb | 9 +++++++++ .../form/sales/questions/person1_age_known_spec.rb | 3 +++ .../form/sales/questions/person2_age_known_spec.rb | 2 +- .../form/sales/questions/person3_age_known_spec.rb | 2 +- .../form/sales/questions/person4_age_known_spec.rb | 2 +- 12 files changed, 57 insertions(+), 20 deletions(-) diff --git a/app/models/form/sales/questions/buyer1_age_known.rb b/app/models/form/sales/questions/buyer1_age_known.rb index 65e021815..842c648f2 100644 --- a/app/models/form/sales/questions/buyer1_age_known.rb +++ b/app/models/form/sales/questions/buyer1_age_known.rb @@ -2,7 +2,7 @@ class Form::Sales::Questions::Buyer1AgeKnown < ::Form::Question def initialize(id, hsh, page) super @id = "age1_known" - @check_answer_label = "Buyer 1’s age" + @check_answer_label = "Lead buyer’s age" @header = "Do you know buyer 1’s age?" @type = "radio" @answer_options = ANSWER_OPTIONS @@ -11,6 +11,16 @@ class Form::Sales::Questions::Buyer1AgeKnown < ::Form::Question @conditional_for = { "age1" => [0], } + @hidden_in_check_answers = { + "depends_on" => [ + { + "age1_known" => 0, + }, + { + "age1_known" => 1, + } + ], + } end ANSWER_OPTIONS = { diff --git a/app/models/form/sales/questions/buyer2_age_known.rb b/app/models/form/sales/questions/buyer2_age_known.rb index bec91f63f..02a2fbfef 100644 --- a/app/models/form/sales/questions/buyer2_age_known.rb +++ b/app/models/form/sales/questions/buyer2_age_known.rb @@ -10,6 +10,16 @@ class Form::Sales::Questions::Buyer2AgeKnown < ::Form::Question @conditional_for = { "age2" => [0], } + @hidden_in_check_answers = { + "depends_on" => [ + { + "age2_known" => 0, + }, + { + "age2_known" => 1, + } + ], + } end ANSWER_OPTIONS = { diff --git a/app/models/form/sales/questions/person1_age_known.rb b/app/models/form/sales/questions/person1_age_known.rb index 603d8649a..910f27113 100644 --- a/app/models/form/sales/questions/person1_age_known.rb +++ b/app/models/form/sales/questions/person1_age_known.rb @@ -16,6 +16,9 @@ class Form::Sales::Questions::Person1AgeKnown < ::Form::Question { "age3_known" => 0, }, + { + "age3_known" => 1, + } ], } end diff --git a/app/models/form/sales/questions/person2_age_known.rb b/app/models/form/sales/questions/person2_age_known.rb index af06a0eb8..3217aa249 100644 --- a/app/models/form/sales/questions/person2_age_known.rb +++ b/app/models/form/sales/questions/person2_age_known.rb @@ -17,11 +17,8 @@ class Form::Sales::Questions::Person2AgeKnown < ::Form::Question "age4_known" => 0, }, { - "details_known_2" => nil, - }, - { - "details_known_2" => 2, - }, + "age4_known" => 1, + } ], } end diff --git a/app/models/form/sales/questions/person3_age_known.rb b/app/models/form/sales/questions/person3_age_known.rb index c784ef1cb..c5444005a 100644 --- a/app/models/form/sales/questions/person3_age_known.rb +++ b/app/models/form/sales/questions/person3_age_known.rb @@ -17,11 +17,8 @@ class Form::Sales::Questions::Person3AgeKnown < ::Form::Question "age5_known" => 0, }, { - "details_known_3" => nil, - }, - { - "details_known_3" => 2, - }, + "age5_known" => 1, + } ], } end diff --git a/app/models/form/sales/questions/person4_age_known.rb b/app/models/form/sales/questions/person4_age_known.rb index e21aa51d6..5d179dc21 100644 --- a/app/models/form/sales/questions/person4_age_known.rb +++ b/app/models/form/sales/questions/person4_age_known.rb @@ -17,11 +17,8 @@ class Form::Sales::Questions::Person4AgeKnown < ::Form::Question "age6_known" => 0, }, { - "details_known_4" => nil, - }, - { - "details_known_4" => 2, - }, + "age6_known" => 1, + } ], } end diff --git a/spec/models/form/sales/questions/buyer1_age_known_spec.rb b/spec/models/form/sales/questions/buyer1_age_known_spec.rb index e1a97b7ef..71dd025e9 100644 --- a/spec/models/form/sales/questions/buyer1_age_known_spec.rb +++ b/spec/models/form/sales/questions/buyer1_age_known_spec.rb @@ -20,7 +20,7 @@ RSpec.describe Form::Sales::Questions::Buyer1AgeKnown, type: :model do end it "has the correct check_answer_label" do - expect(question.check_answer_label).to eq("Buyer 1’s age") + expect(question.check_answer_label).to eq("Lead buyer’s age") end it "has the correct type" do @@ -48,4 +48,15 @@ RSpec.describe Form::Sales::Questions::Buyer1AgeKnown, type: :model do it "has the correct hint" do expect(question.hint_text).to eq("Buyer 1 is the person in the household who does the most paid work. If it’s a joint purchase and the buyers do the same amount of paid work, buyer 1 is whoever is the oldest.") end + + it "has correct conditional for" do + expect(question.hidden_in_check_answers).to eq({ + "depends_on" => [{ + "age1_known" => 0, + }, + { + "age1_known" => 1, + }], + }) + end end diff --git a/spec/models/form/sales/questions/buyer2_age_known_spec.rb b/spec/models/form/sales/questions/buyer2_age_known_spec.rb index 825644198..711a4015d 100644 --- a/spec/models/form/sales/questions/buyer2_age_known_spec.rb +++ b/spec/models/form/sales/questions/buyer2_age_known_spec.rb @@ -43,4 +43,13 @@ RSpec.describe Form::Sales::Questions::Buyer2AgeKnown, type: :model do "age2" => [0], }) end + + it "has correct hidden in check answers" do + expect(question.hidden_in_check_answers).to eq({ + "depends_on" => [{ + "age2_known" => 0 + }, + {"age2_known" => 1}] + }) + end end diff --git a/spec/models/form/sales/questions/person1_age_known_spec.rb b/spec/models/form/sales/questions/person1_age_known_spec.rb index d6f372692..a3871b48c 100644 --- a/spec/models/form/sales/questions/person1_age_known_spec.rb +++ b/spec/models/form/sales/questions/person1_age_known_spec.rb @@ -55,6 +55,9 @@ RSpec.describe Form::Sales::Questions::Person1AgeKnown, type: :model do { "age3_known" => 0, }, + { + "age3_known" => 1, + }, ], }, ) diff --git a/spec/models/form/sales/questions/person2_age_known_spec.rb b/spec/models/form/sales/questions/person2_age_known_spec.rb index 7ebee9dee..7dc33563b 100644 --- a/spec/models/form/sales/questions/person2_age_known_spec.rb +++ b/spec/models/form/sales/questions/person2_age_known_spec.rb @@ -51,7 +51,7 @@ RSpec.describe Form::Sales::Questions::Person2AgeKnown, type: :model do it "has the correct hidden_in_check_answers" do expect(question.hidden_in_check_answers).to eq( { - "depends_on" => [{ "age4_known" => 0 }, { "details_known_2" => nil }, { "details_known_2" => 2 }], + "depends_on" => [{ "age4_known" => 0 }, {"age4_known" => 1}], }, ) end diff --git a/spec/models/form/sales/questions/person3_age_known_spec.rb b/spec/models/form/sales/questions/person3_age_known_spec.rb index bb1762c88..982f9ef15 100644 --- a/spec/models/form/sales/questions/person3_age_known_spec.rb +++ b/spec/models/form/sales/questions/person3_age_known_spec.rb @@ -51,7 +51,7 @@ RSpec.describe Form::Sales::Questions::Person3AgeKnown, type: :model do it "has the correct hidden_in_check_answers" do expect(question.hidden_in_check_answers).to eq( { - "depends_on" => [{ "age5_known" => 0 }, { "details_known_3" => nil }, { "details_known_3" => 2 }], + "depends_on" => [{ "age5_known" => 0 }, {"age5_known" => 1}], }, ) end diff --git a/spec/models/form/sales/questions/person4_age_known_spec.rb b/spec/models/form/sales/questions/person4_age_known_spec.rb index 41a64cbea..fe64e12e4 100644 --- a/spec/models/form/sales/questions/person4_age_known_spec.rb +++ b/spec/models/form/sales/questions/person4_age_known_spec.rb @@ -51,7 +51,7 @@ RSpec.describe Form::Sales::Questions::Person4AgeKnown, type: :model do it "has the correct hidden_in_check_answers" do expect(question.hidden_in_check_answers).to eq( { - "depends_on" => [{ "age6_known" => 0 }, { "details_known_4" => nil }, { "details_known_4" => 2 }], + "depends_on" => [{ "age6_known" => 0 }, {"age6_known" => 1}], }, ) end