Merged in [16902] from sasha@dashcare.nl:

Ref #2526 - Fix test failure in [16895]
This also makes a small text clarification, which was also the initial
reason for the test failure.
 - Legacy-Id: 16912
Note: SVN reference [16895] has been migrated to Git commit ef1e8006f0

Note: SVN reference [16902] has been migrated to Git commit 78a1464e77
This commit is contained in:
Henrik Levkowetz 2019-10-23 13:31:46 +00:00
commit 399d0e1797
2 changed files with 2 additions and 2 deletions

View file

@ -271,7 +271,7 @@ class ReviewTests(TestCase):
q = PyQuery(r.content)
generated_text = q("[name=body]").text()
self.assertTrue(review_req1.doc.name in generated_text)
self.assertTrue('(-0 lc review)' in generated_text) # previous completed assignment
self.assertTrue('(-0 lc reviewed)' in generated_text) # previous completed assignment
self.assertTrue(six.text_type(Person.objects.get(user__username="marschairman")) in generated_text)
empty_outbox()

View file

@ -1607,7 +1607,7 @@ def email_open_review_assignments(request, acronym, group_type=None):
r.lastcall_ends = e and e.expires.date().isoformat()
r.earlier_review = ReviewAssignment.objects.filter(review_request__doc=r.review_request.doc,reviewer__in=r.reviewer.person.email_set.all(),state="completed")
if r.earlier_review:
earlier_reviews_formatted = ['-{} {} completed'.format(ra.reviewed_rev, ra.review_request.type.slug) for ra in r.earlier_review]
earlier_reviews_formatted = ['-{} {} reviewed'.format(ra.reviewed_rev, ra.review_request.type.slug) for ra in r.earlier_review]
r.earlier_reviews = '({})'.format(', '.join(earlier_reviews_formatted))
review_assignments.sort(key=lambda r: r.section_order)