From ba973c5b5c703b8603ec8a53aa2ac9f75f42fa5d Mon Sep 17 00:00:00 2001 From: Dan Braghis <dan.braghis@torchbox.com> Date: Tue, 19 Jun 2018 12:17:15 +0100 Subject: [PATCH] fixup! Add simple test for field group titles on reviews --- opentech/apply/review/tests/test_views.py | 10 +++------- opentech/apply/review/views.py | 2 ++ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/opentech/apply/review/tests/test_views.py b/opentech/apply/review/tests/test_views.py index c9853b515..4ba0a18d8 100644 --- a/opentech/apply/review/tests/test_views.py +++ b/opentech/apply/review/tests/test_views.py @@ -121,15 +121,11 @@ class ReviewDetailTestCase(BaseTestCase): url_name = 'funds:submissions:reviews:{}' def get_kwargs(self, instance): - return {'submission_pk': instance.id} + return {'pk': instance.id, 'submission_pk': instance.submission.id} def test_review_detail_field_groups(self): - submission = ApplicationSubmissionFactory(workflow_stages=2) + submission = ApplicationSubmissionFactory(status='draft_proposal', workflow_stages=2) review = ReviewFactory(submission=submission, author=self.user) - response = self.get_page(review, 'detail') + response = self.get_page(review) self.assertContains(response, submission.title) - self.assertContains(response, reverse('funds:submissions:reviews:review', kwargs={ - 'pk': review.id, - 'submission_pk': submission.id, - })) self.assertContains(response, "<h4>A. Conflicts of Interest and Confidentiality</h4>") diff --git a/opentech/apply/review/views.py b/opentech/apply/review/views.py index 21282213a..943558666 100644 --- a/opentech/apply/review/views.py +++ b/opentech/apply/review/views.py @@ -119,6 +119,8 @@ class ReviewDetailView(DetailView): try: # Add titles which exist title = form_used.titles[field.group] + # Setting the value to a flag, so the output is treated slightly differently + # This will change with the StreamForms implementation review_data.setdefault(title, '<field_group_title>') except AttributeError: pass -- GitLab