diff --git a/edivorce/apps/core/tests.py b/edivorce/apps/core/tests.py index 9c905869..fc992350 100644 --- a/edivorce/apps/core/tests.py +++ b/edivorce/apps/core/tests.py @@ -215,19 +215,8 @@ class UserResponseTestCase(TestCase): 'question__required') self.assertEqual(is_complete(step, lst)[0], False) - # All required question and one not shown question(shouldn't be affecting) create_response(user, 'marital_status_before_spouse', 'Widowed') - lst = UserResponse.objects.filter(question_id__in=questions).values('question_id', 'value', - 'question__conditional_target', - 'question__reveal_response', - 'question__required') - self.assertEqual(is_complete(step, lst)[0], True) - - # Test for Legally Married state - UserResponse.objects.filter(question_id='married_marriage_like').update(value="Legally married") - - # Missing some required questions lst = UserResponse.objects.filter(question_id__in=questions).values('question_id', 'value', 'question__conditional_target', 'question__reveal_response', @@ -511,19 +500,9 @@ class UserResponseTestCase(TestCase): 'question__conditional_target', 'question__reveal_response', 'question__required') - self.assertEqual(is_complete(step, lst)[0], True) - - # All required questions for spouse and you - create_response(user, 'address_to_send_official_document_postal_code_spouse', 'Canada') - - lst = UserResponse.objects.filter(question_id__in=questions).values('question_id', 'value', - 'question__conditional_target', - 'question__reveal_response', - 'question__required') - self.assertEqual(is_complete(step, lst)[0], True) + self.assertEqual(is_complete(step, lst)[0], False) - # All required questions for spouse and you with empty email(optional so still true) - create_response(user, 'address_to_send_official_document_email_you', 'a@example.com') + create_response(user, 'divorce_take_effect_on', 'the 31st day after the date of this order') lst = UserResponse.objects.filter(question_id__in=questions).values('question_id', 'value', 'question__conditional_target', @@ -531,10 +510,9 @@ class UserResponseTestCase(TestCase): 'question__required') self.assertEqual(is_complete(step, lst)[0], True) - # Test for Legally Married state - UserResponse.objects.filter(question_id='married_marriage_like').update(value="Legally married") + # Missing required question + UserResponse.objects.filter(question_id='divorce_take_effect_on').update(value="specific date") - # Missing some required questions for legally married state lst = UserResponse.objects.filter(question_id__in=questions).values('question_id', 'value', 'question__conditional_target', 'question__reveal_response', @@ -542,7 +520,7 @@ class UserResponseTestCase(TestCase): self.assertEqual(is_complete(step, lst)[0], False) # All required questions - create_response(user, 'divorce_take_effect_on', 'the 31st day after the date of this order') + create_response(user, 'divorce_take_effect_on_specific_date', '12/12/2018') lst = UserResponse.objects.filter(question_id__in=questions).values('question_id', 'value', 'question__conditional_target', @@ -550,17 +528,17 @@ class UserResponseTestCase(TestCase): 'question__required') self.assertEqual(is_complete(step, lst)[0], True) - # Missing required question - UserResponse.objects.filter(question_id='divorce_take_effect_on').update(value="specific date") + # All required questions for spouse and you + create_response(user, 'address_to_send_official_document_postal_code_spouse', 'Canada') lst = UserResponse.objects.filter(question_id__in=questions).values('question_id', 'value', 'question__conditional_target', 'question__reveal_response', 'question__required') - self.assertEqual(is_complete(step, lst)[0], False) + self.assertEqual(is_complete(step, lst)[0], True) - # All required questions - create_response(user, 'divorce_take_effect_on_specific_date', '12/12/2018') + # All required questions for spouse and you with empty email(optional so still true) + create_response(user, 'address_to_send_official_document_email_you', 'a@example.com') lst = UserResponse.objects.filter(question_id__in=questions).values('question_id', 'value', 'question__conditional_target', diff --git a/edivorce/fixtures/Question.json b/edivorce/fixtures/Question.json index 4fd07831..b4e04c1f 100644 --- a/edivorce/fixtures/Question.json +++ b/edivorce/fixtures/Question.json @@ -98,9 +98,7 @@ "name": "Will you be able to provide proof of your marriage (in the form of an original or certified marriage certificate or registration of marriage)?", "description": "For pre-qualification step 5, Form 1 2. Divorce section D, Form 38(joint and sole) question 4", "summary_order": 10, - "required": "Conditional", - "conditional_target": "married_marriage_like", - "reveal_response": "Legally married" + "required": "Required" }, "model": "core.question", "pk": "original_marriage_certificate" @@ -158,9 +156,7 @@ "name": "What is your reason (grounds) for asking for a divorce?", "description": "For pre-qualification step 6", "summary_order": 15, - "required": "Conditional", - "conditional_target": "married_marriage_like", - "reveal_response": "Legally married" + "required": "Required" }, "model": "core.question", "pk": "divorce_reason" @@ -369,9 +365,7 @@ "name": "When were you married?", "description": "For step 4, Form 1 1. Relationship history, Form 52 Court orders that section", "summary_order": 35, - "required": "Conditional", - "conditional_target": "married_marriage_like", - "reveal_response": "Legally married" + "required": "Required" }, "model": "core.question", "pk": "when_were_you_married" @@ -391,9 +385,7 @@ "name": "Where were you married?", "description": "For step 4, Form 1 2. Divorce section A, Form 52 Court orders that section", "summary_order": 37, - "required": "Conditional", - "conditional_target": "married_marriage_like", - "reveal_response": "Legally married" + "required": "Required" }, "model": "core.question", "pk": "where_were_you_married_city" @@ -403,9 +395,7 @@ "name": "Where were you married? Prov", "description": "For step 4, Form 1 2. Divorce section A, Form 52 Court orders that section", "summary_order": 38, - "required": "Conditional", - "conditional_target": "married_marriage_like", - "reveal_response": "Legally married" + "required": "Required" }, "model": "core.question", "pk": "where_were_you_married_prov" @@ -415,9 +405,7 @@ "name": "Where were you married? Country", "description": "For step 4, Form 1 2. Divorce section A, Form 52 Court orders that section", "summary_order": 39, - "required": "Conditional", - "conditional_target": "married_marriage_like", - "reveal_response": "Legally married" + "required": "Required" }, "model": "core.question", "pk": "where_were_you_married_country"