From 9511f7d37ff5127bc3ad3bc5e0c594f7904c79c0 Mon Sep 17 00:00:00 2001 From: ariannedee Date: Mon, 14 Sep 2020 15:28:39 -0700 Subject: [PATCH] Fix tests and error checking --- edivorce/apps/core/tests/test_step_completeness.py | 5 +++-- edivorce/apps/core/utils/derived.py | 7 ++++++- edivorce/apps/core/utils/question_step_mapping.py | 2 ++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/edivorce/apps/core/tests/test_step_completeness.py b/edivorce/apps/core/tests/test_step_completeness.py index cdbb3018..2a7c7a27 100644 --- a/edivorce/apps/core/tests/test_step_completeness.py +++ b/edivorce/apps/core/tests/test_step_completeness.py @@ -489,12 +489,12 @@ class ChildrenStepCompletenessTestCase(TestCase): def test_fact_sheet_d(self): # Don't show fact sheet self.create_response('children_of_marriage', 'YES') - self.create_response('number_children_over_19', '0') + self.create_response('has_children_over_19', 'NO') self.assertFalse(self.get_derived_value('show_fact_sheet_d')) self.assertFalse(self.get_derived_value('fact_sheet_d_error')) # Must be supporting children over 19 to show fact sheet - self.create_response('number_children_over_19', '1') + self.create_response('has_children_over_19', 'YES') self.create_response('children_financial_support', '["NO"]') self.assertFalse(self.get_derived_value('show_fact_sheet_d')) @@ -503,6 +503,7 @@ class ChildrenStepCompletenessTestCase(TestCase): self.assertTrue(self.get_derived_value('fact_sheet_d_error')) # Basic required fields + self.create_response('number_children_over_19_need_support', '1') self.create_response('agree_to_guideline_child_support_amount', 'YES') self.assertFalse(self.get_derived_value('fact_sheet_d_error')) diff --git a/edivorce/apps/core/utils/derived.py b/edivorce/apps/core/utils/derived.py index 2c0697af..8dc9f6b7 100644 --- a/edivorce/apps/core/utils/derived.py +++ b/edivorce/apps/core/utils/derived.py @@ -211,7 +211,12 @@ def show_fact_sheet_d(responses, derived): def fact_sheet_d_error(responses, derived): - questions = ['agree_to_guideline_child_support_amount', 'appropriate_spouse_paid_child_support', 'suggested_child_support'] + questions = [ + 'number_children_over_19_need_support', + 'agree_to_guideline_child_support_amount', + 'appropriate_spouse_paid_child_support', + 'suggested_child_support' + ] if derived['show_fact_sheet_d']: return _any_question_errors(responses, questions) diff --git a/edivorce/apps/core/utils/question_step_mapping.py b/edivorce/apps/core/utils/question_step_mapping.py index c46095a6..64a93b8c 100644 --- a/edivorce/apps/core/utils/question_step_mapping.py +++ b/edivorce/apps/core/utils/question_step_mapping.py @@ -72,6 +72,7 @@ children_substep_question_mapping = { 'number_of_children_claimant_spouse', 'your_child_support_paid_c', # Fact sheet D + 'number_children_over_19_need_support', 'agree_to_guideline_child_support_amount', 'appropriate_spouse_paid_child_support', 'suggested_child_support', @@ -206,6 +207,7 @@ question_step_mapping = { 'number_of_children_claimant_spouse', 'your_child_support_paid_c', # Fact sheet D + 'number_children_over_19_need_support', 'agree_to_guideline_child_support_amount', 'appropriate_spouse_paid_child_support', 'suggested_child_support',