From 38629160cc74c94146da77b6a4f4995032f65635 Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Tue, 31 Mar 2020 12:00:09 +0100 Subject: [PATCH] Use full name for 'requested by' and test additional fields --- wagtail/admin/templates/wagtailadmin/reports/workflow.html | 2 +- wagtail/admin/tests/test_workflows.py | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/wagtail/admin/templates/wagtailadmin/reports/workflow.html b/wagtail/admin/templates/wagtailadmin/reports/workflow.html index d63882f8e3..52c8cd002e 100644 --- a/wagtail/admin/templates/wagtailadmin/reports/workflow.html +++ b/wagtail/admin/templates/wagtailadmin/reports/workflow.html @@ -75,7 +75,7 @@ {% endfor %} - {{ workflow_state.requested_by }} + {{ workflow_state.requested_by.get_full_name|default:workflow_state.requested_by.get_username }} {{ workflow_state.created_at }} {% endfor %} diff --git a/wagtail/admin/tests/test_workflows.py b/wagtail/admin/tests/test_workflows.py index af472d19c2..33b7e13768 100644 --- a/wagtail/admin/tests/test_workflows.py +++ b/wagtail/admin/tests/test_workflows.py @@ -9,6 +9,7 @@ from django.core.mail import EmailMultiAlternatives from django.test import TestCase, override_settings from django.urls import reverse +from freezegun import freeze_time from wagtail.core.models import ( GroupApprovalTask, Page, Task, TaskState, Workflow, WorkflowPage, WorkflowState, WorkflowTask) from wagtail.core.signals import page_published @@ -451,11 +452,14 @@ class TestSubmitToWorkflow(TestCase, WagtailTestUtils): self.assertTrue(headers.issubset(msg_headers), msg='Message is missing the Auto-Submitted header.',) +@freeze_time("2020-03-31 12:00:00") class TestApproveRejectWorkflow(TestCase, WagtailTestUtils): def setUp(self): delete_existing_workflows() self.submitter = get_user_model().objects.create_user( username='submitter', + first_name='Sebastian', + last_name='Mitter', email='submitter@email.com', password='password', ) @@ -621,6 +625,9 @@ class TestApproveRejectWorkflow(TestCase, WagtailTestUtils): response = self.client.get(reverse('wagtailadmin_reports:workflow')) self.assertEqual(response.status_code, 200) self.assertContains(response, "Hello world!") + self.assertContains(response, "test_workflow") + self.assertContains(response, "Sebastian Mitter") + self.assertContains(response, "March 31, 2020") response = self.client.get(reverse('wagtailadmin_reports:workflow_tasks')) self.assertEqual(response.status_code, 200)