diff --git a/edivorce/apps/core/templates/question/07_property.html b/edivorce/apps/core/templates/question/07_property.html
index a4b93366..954f8876 100644
--- a/edivorce/apps/core/templates/question/07_property.html
+++ b/edivorce/apps/core/templates/question/07_property.html
@@ -126,12 +126,10 @@
You can ask for an interest in the property (part ownership) or compensation (money). If the property is real estate, provide the legal description.
-
-
-
-
+
+
{% input_field type="textarea" name="other_property_claims" rows="8" cols="65" class="response-textarea" %}
diff --git a/edivorce/apps/core/tests.py b/edivorce/apps/core/tests.py
index d28a653a..5ccd6424 100644
--- a/edivorce/apps/core/tests.py
+++ b/edivorce/apps/core/tests.py
@@ -342,15 +342,9 @@ class UserResponseTestCase(TestCase):
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)
- # Only one required question with no hidden shown
+ # All required question with no hidden shown
create_response(user, 'deal_with_property_debt', 'Equal division')
- 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)
-
- # All required question with hidden shown and answered
- create_response(user, 'other_property_claims', 'Want these property claims')
-
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)
@@ -360,7 +354,7 @@ class UserResponseTestCase(TestCase):
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)
- # All required question with hidden shown and answered
+ # Only one required question with hidden shown and answered
create_response(user, 'how_to_divide_property_debt', 'Do not divide them')
lst = UserResponse.objects.filter(question_id__in=questions).values('question_id', 'value', 'question__conditional_target', 'question__reveal_response', 'question__required')
@@ -373,11 +367,17 @@ class UserResponseTestCase(TestCase):
# 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)
+ # All required question with hidden shown and answered
+ create_response(user, 'other_property_claims', 'Want these property claims')
+
+ 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)
+
# Put empty response
- UserResponse.objects.filter(question_id='other_property_claims').update(value="")
+ # UserResponse.objects.filter(question_id='want_other_property_claims').update(value="")
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)
def test_other_orders(self):
step = 'other_orders'
diff --git a/edivorce/fixtures/Question.json b/edivorce/fixtures/Question.json
index 604b243a..9c57f777 100644
--- a/edivorce/fixtures/Question.json
+++ b/edivorce/fixtures/Question.json
@@ -532,7 +532,7 @@
"name": "Please list any other property claims.",
"description": "For step 7, Form 1 6. Property and debt",
"summary_order": 50,
- "required": "Required"
+ "required": "Conditional"
},
"model": "core.question",
"pk": "other_property_claims"