wagtail 6.2.1__py3-none-any.whl → 6.3rc1__py3-none-any.whl

wagtail/admin/tests/pages/test_workflow_history.py

@@ -1,13 +1,22 @@
+import datetime
+
+from django.conf import settings
 from django.contrib.auth.models import Permission
 from django.test import TestCase
 from django.urls import reverse
+from django.utils import timezone
+from django.utils.formats import localize
+from freezegun import freeze_time
 
+from wagtail.admin.utils import get_user_display_name
 from wagtail.models import Page
 from wagtail.test.utils import WagtailTestUtils
+from wagtail.test.utils.template_tests import AdminTemplateTestUtils
 
 
-class TestWorkflowHistoryDetail(WagtailTestUtils, TestCase):
+class TestWorkflowHistoryDetail(AdminTemplateTestUtils, WagtailTestUtils, TestCase):
     fixtures = ["test.json"]
+    base_breadcrumb_items = []
 
     def setUp(self):
         self.user = self.create_test_user()
@@ -16,10 +25,42 @@ class TestWorkflowHistoryDetail(WagtailTestUtils, TestCase):
         self.christmas_event = Page.objects.get(
             url_path="/home/events/christmas/"
         ).specific
-        self.christmas_event.save_revision()
+
+        self.site_root = Page.objects.specific().get(id=2)
+        self.events_page = self.christmas_event.get_parent().specific
 
         workflow = self.christmas_event.get_workflow()
-        self.workflow_state = workflow.start(self.christmas_event, self.user)
+
+        self.timestamps = [
+            datetime.datetime(2020, 1, 1, 10, 0, 0),
+            datetime.datetime(2020, 1, 1, 11, 0, 0),
+            datetime.datetime(2020, 1, 2, 12, 0, 0),
+            datetime.datetime(2020, 1, 3, 13, 0, 0),
+            datetime.datetime(2020, 1, 4, 14, 0, 0),
+        ]
+
+        if settings.USE_TZ:
+            self.timestamps[:] = [
+                timezone.make_aware(timestamp, timezone=datetime.timezone.utc)
+                for timestamp in self.timestamps
+            ]
+            self.localized_timestamps = [
+                localize(timezone.localtime(timestamp), "c")
+                for timestamp in self.timestamps
+            ]
+        else:
+            self.localized_timestamps = [
+                localize(timestamp, "c") for timestamp in self.timestamps
+            ]
+
+        self.moderator = self.create_superuser("moderator")
+        self.moderator_name = get_user_display_name(self.moderator)
+        self.user_name = get_user_display_name(self.user)
+
+        with freeze_time(self.timestamps[0]):
+            self.christmas_event.save_revision()
+        with freeze_time(self.timestamps[1]):
+            self.workflow_state = workflow.start(self.christmas_event, self.user)
 
     def test_get_index(self):
         response = self.client.get(
@@ -40,6 +81,36 @@ class TestWorkflowHistoryDetail(WagtailTestUtils, TestCase):
             ),
         )
 
+        # Should show the currently in progress workflow
+        self.assertContains(response, "Moderators approval")
+        self.assertContains(response, "In progress")
+        self.assertContains(response, "test@email.com")
+
+        items = [
+            {
+                "url": reverse("wagtailadmin_explore_root"),
+                "label": "Root",
+            },
+            {
+                "url": reverse("wagtailadmin_explore", args=(self.site_root.id,)),
+                "label": self.site_root.get_admin_display_title(),
+            },
+            {
+                "url": reverse("wagtailadmin_explore", args=(self.events_page.id,)),
+                "label": self.events_page.get_admin_display_title(),
+            },
+            {
+                "url": reverse("wagtailadmin_explore", args=(self.christmas_event.id,)),
+                "label": self.christmas_event.get_admin_display_title(),
+            },
+            {
+                "url": "",
+                "label": "Workflow history",
+                "sublabel": self.christmas_event.get_admin_display_title(),
+            },
+        ]
+        self.assertBreadcrumbsItemsRendered(items, response.content)
+
     def test_get_index_with_bad_permissions(self):
         # Remove privileges from user
         self.user.is_superuser = False
@@ -59,12 +130,28 @@ class TestWorkflowHistoryDetail(WagtailTestUtils, TestCase):
         self.assertEqual(response.status_code, 302)
 
     def test_get_detail(self):
-        response = self.client.get(
-            reverse(
-                "wagtailadmin_pages:workflow_history_detail",
-                args=[self.christmas_event.id, self.workflow_state.id],
+        task_state = self.workflow_state.current_task_state
+
+        with freeze_time(self.timestamps[2]):
+            task_state.task.on_action(
+                task_state, user=self.moderator, action_name="reject"
             )
+        self.workflow_state.refresh_from_db()
+
+        with freeze_time(self.timestamps[3]):
+            self.christmas_event.save_revision(user=self.user)
+            self.workflow_state.resume(user=self.user)
+        self.workflow_state.refresh_from_db()
+
+        url = reverse(
+            "wagtailadmin_pages:workflow_history_detail",
+            args=[self.christmas_event.id, self.workflow_state.id],
         )
+        self.client.get(url)
+
+        with self.assertNumQueries(18):
+            response = self.client.get(url)
+
         self.assertEqual(response.status_code, 200)
 
         self.assertContains(
@@ -78,9 +165,203 @@ class TestWorkflowHistoryDetail(WagtailTestUtils, TestCase):
         )
 
         self.assertContains(response, '<div class="w-tabs" data-tabs>')
+        self.assertContains(response, '<div class="tab-content">')
+
+        soup = self.get_soup(response.content)
+        tasks = soup.select_one("#tab-tasks table")
+        self.assertIsNotNone(tasks)
+        cells = [
+            [td.get_text(separator=" ", strip=True) for td in tr.select("td")]
+            for tr in tasks.select("tr")
+        ]
 
+        self.assertEqual(
+            cells,
+            [
+                # This is divided into different columns per task, so it makes
+                # sense to start with the initial revision on the first cell and
+                # then it should be rendered in ascending order.
+                [
+                    "Initial Revision",
+                    f"Rejected by {self.moderator_name} at {self.localized_timestamps[2]}",
+                ],
+                [
+                    f"Edited by {self.user_name} at {self.localized_timestamps[3]}",
+                    "In progress",
+                ],
+            ],
+        )
+
+        timeline = soup.select_one("#tab-timeline table")
+        self.assertIsNotNone(timeline)
+        cells = [
+            [td.get_text(separator=" ", strip=True) for td in tr.select("td")]
+            for tr in timeline.select("tr")
+        ]
+        self.assertEqual(
+            cells,
+            [
+                # The items are merged into a single column as a timeline, so it
+                # should be rendered in reverse chronological order.
+                [
+                    self.localized_timestamps[3],
+                    "Edited",
+                ],
+                [
+                    self.localized_timestamps[2],
+                    f"Moderators approval Rejected by {self.moderator_name}",
+                ],
+                [
+                    self.localized_timestamps[1],
+                    "Workflow started",
+                ],
+                [
+                    self.localized_timestamps[0],
+                    "Edited",
+                ],
+            ],
+        )
+
+        items = [
+            {
+                "url": reverse("wagtailadmin_explore_root"),
+                "label": "Root",
+            },
+            {
+                "url": reverse("wagtailadmin_explore", args=(self.site_root.id,)),
+                "label": self.site_root.get_admin_display_title(),
+            },
+            {
+                "url": reverse("wagtailadmin_explore", args=(self.events_page.id,)),
+                "label": self.events_page.get_admin_display_title(),
+            },
+            {
+                "url": reverse("wagtailadmin_explore", args=(self.christmas_event.id,)),
+                "label": self.christmas_event.get_admin_display_title(),
+            },
+            {
+                "url": reverse(
+                    "wagtailadmin_pages:workflow_history",
+                    args=(self.christmas_event.id,),
+                ),
+                "label": "Workflow history",
+            },
+            {
+                "url": "",
+                "label": "Workflow progress",
+                "sublabel": self.christmas_event.get_admin_display_title(),
+            },
+        ]
+        self.assertBreadcrumbsItemsRendered(items, response.content)
+
+    def test_get_detail_completed(self):
+        task_state = self.workflow_state.current_task_state
+
+        with freeze_time(self.timestamps[2]):
+            task_state.task.on_action(
+                task_state, user=self.moderator, action_name="reject"
+            )
+        self.workflow_state.refresh_from_db()
+
+        with freeze_time(self.timestamps[3]):
+            self.christmas_event.save_revision(user=self.user)
+            self.workflow_state.resume(user=self.user)
+        self.workflow_state.refresh_from_db()
+
+        with freeze_time(self.timestamps[4]):
+            task_state = self.workflow_state.current_task_state
+            task_state.task.on_action(
+                task_state, user=self.moderator, action_name="approve"
+            )
+        self.workflow_state.refresh_from_db()
+
+        url = reverse(
+            "wagtailadmin_pages:workflow_history_detail",
+            args=[self.christmas_event.id, self.workflow_state.id],
+        )
+        self.client.get(url)
+
+        with self.assertNumQueries(19):
+            response = self.client.get(url)
+
+        self.assertEqual(response.status_code, 200)
+
+        self.assertContains(
+            response, reverse("wagtailadmin_pages:edit", args=[self.christmas_event.id])
+        )
+        self.assertContains(
+            response,
+            reverse(
+                "wagtailadmin_pages:workflow_history", args=[self.christmas_event.id]
+            ),
+        )
+
+        self.assertContains(response, '<div class="w-tabs" data-tabs>')
         self.assertContains(response, '<div class="tab-content">')
 
+        soup = self.get_soup(response.content)
+        tasks = soup.select_one("#tab-tasks table")
+        self.assertIsNotNone(tasks)
+        cells = [
+            [td.get_text(separator=" ", strip=True) for td in tr.select("td")]
+            for tr in tasks.select("tr")
+        ]
+
+        self.assertEqual(
+            cells,
+            [
+                # This is divided into different columns per task, so it makes
+                # sense to start with the initial revision on the first cell and
+                # then it should be rendered in ascending order.
+                [
+                    "Initial Revision",
+                    f"Rejected by {self.moderator_name} at {self.localized_timestamps[2]}",
+                ],
+                [
+                    f"Edited by {self.user_name} at {self.localized_timestamps[3]}",
+                    f"Approved by {self.moderator_name} at {self.localized_timestamps[4]}",
+                ],
+            ],
+        )
+
+        timeline = soup.select_one("#tab-timeline table")
+        self.assertIsNotNone(timeline)
+        cells = [
+            [td.get_text(separator=" ", strip=True) for td in tr.select("td")]
+            for tr in timeline.select("tr")
+        ]
+        self.assertEqual(
+            cells,
+            [
+                # The items are merged into a single column as a timeline, so it
+                # should be rendered in reverse chronological order.
+                [
+                    self.localized_timestamps[4],
+                    "Workflow completed Approved",
+                ],
+                [
+                    self.localized_timestamps[4],
+                    f"Moderators approval Approved by {self.moderator_name}",
+                ],
+                [
+                    self.localized_timestamps[3],
+                    "Edited",
+                ],
+                [
+                    self.localized_timestamps[2],
+                    f"Moderators approval Rejected by {self.moderator_name}",
+                ],
+                [
+                    self.localized_timestamps[1],
+                    "Workflow started",
+                ],
+                [
+                    self.localized_timestamps[0],
+                    "Edited",
+                ],
+            ],
+        )
+
     def test_get_detail_with_bad_permissions(self):
         # Remove privileges from user
         self.user.is_superuser = False

wagtail/admin/tests/test_account_management.py

@@ -1,6 +1,6 @@
 import unittest
 
-import pytz
+import zoneinfo
 from django.conf import settings
 from django.contrib.auth import get_user_model
 from django.contrib.auth import views as auth_views
@@ -232,6 +232,7 @@ class TestAccountSectionUtilsMixin:
             "locale-current_time_zone": "Europe/London",
             "theme-theme": "dark",
             "theme-density": "default",
+            "theme-contrast": "system",
         }
         post_data.update(extra_post_data)
         return self.client.post(reverse("wagtailadmin_account"), post_data)
@@ -244,6 +245,7 @@ class TestAccountSection(WagtailTestUtils, TestCase, TestAccountSectionUtilsMixi
 
     def setUp(self):
         self.user = self.login()
+        get_available_admin_time_zones.cache_clear()
 
     def test_account_view(self):
         """
@@ -479,7 +481,7 @@ class TestAccountSection(WagtailTestUtils, TestCase, TestAccountSectionUtilsMixi
         response = self.client.get(reverse("wagtailadmin_home"))
         self.assertContains(
             response,
-            '<html lang="es" dir="ltr" class="w-theme-dark w-density-default">',
+            '<html lang="es" dir="ltr" class="w-theme-dark w-density-default w-contrast-system">',
         )
 
     def test_unset_language_preferences(self):
@@ -567,7 +569,10 @@ class TestAccountSection(WagtailTestUtils, TestCase, TestAccountSectionUtilsMixi
 
     @unittest.skipUnless(settings.USE_TZ, "Timezone support is disabled")
     def test_available_admin_time_zones_by_default(self):
-        self.assertListEqual(get_available_admin_time_zones(), pytz.common_timezones)
+        self.assertListEqual(
+            get_available_admin_time_zones(),
+            sorted(zoneinfo.available_timezones()),
+        )
 
     @unittest.skipUnless(settings.USE_TZ, "Timezone support is disabled")
     @override_settings(WAGTAIL_USER_TIME_ZONES=["Europe/London"])
@@ -606,6 +611,21 @@ class TestAccountSection(WagtailTestUtils, TestCase, TestAccountSectionUtilsMixi
 
         self.assertEqual(profile.theme, "light")
 
+    def test_change_contrast_post(self):
+        response = self.post_form(
+            {
+                "theme-contrast": "more_contrast",
+            }
+        )
+
+        # Check that the user was redirected to the account page
+        self.assertRedirects(response, reverse("wagtailadmin_account"))
+
+        profile = UserProfile.get_for_user(self.user)
+        profile.refresh_from_db()
+
+        self.assertEqual(profile.contrast, "more_contrast")
+
     def test_change_density_post(self):
         response = self.post_form(
             {

wagtail/admin/tests/test_audit_log.py

@@ -1,7 +1,9 @@
 from datetime import timedelta
+from io import StringIO
 
 from django.conf import settings
 from django.contrib.auth.models import Group, Permission
+from django.core.management import call_command
 from django.test import TestCase
 from django.urls import reverse
 from django.utils import timezone
@@ -144,8 +146,8 @@ class TestAuditLogAdmin(AdminTemplateTestUtils, WagtailTestUtils, TestCase):
         )
 
         self.assertContains(
-            response, "system", 3
-        )  # create without a user + remove restriction + 1 from unrelated admin color theme
+            response, "system", 4
+        )  # create without a user + remove restriction + 2 from unrelated admin color theme
         self.assertContains(
             response, "the_editor", 9
         )  # 7 entries by editor + 1 in sidebar menu + 1 in filter
@@ -305,6 +307,26 @@ class TestAuditLogAdmin(AdminTemplateTestUtils, WagtailTestUtils, TestCase):
         response = self.client.get(reverse("wagtailadmin_reports:site_history"))
         self.assertContains(response, expected_deleted_string)
 
+    def test_page_history_after_revision_purge(self):
+        self._update_page(self.hello_page)
+        call_command("purge_revisions", days=0, stdout=StringIO())
+
+        history_url = reverse(
+            "wagtailadmin_pages:history", kwargs={"page_id": self.hello_page.id}
+        )
+
+        self.login(user=self.editor)
+
+        response = self.client.get(history_url)
+        self.assertEqual(response.status_code, 200)
+
+        self.assertContains(response, "Created", 1)
+        self.assertContains(response, "Draft saved", 2)
+        self.assertContains(response, "Locked", 1)
+        self.assertContains(response, "Unlocked", 1)
+        self.assertContains(response, "Page scheduled for publishing", 1)
+        self.assertContains(response, "Published", 1)
+
     def test_edit_form_has_history_link(self):
         self.hello_page.save_revision()
         self.login(user=self.editor)

wagtail/admin/tests/test_collections_views.py

@@ -337,7 +337,11 @@ class TestEditCollectionAsSuperuser(AdminTemplateTestUtils, WagtailTestUtils, Te
     def test_get(self):
         response = self.get()
         self.assertEqual(response.status_code, 200)
-        self.assertContains(response, "Delete collection")
+        delete_url = reverse(
+            "wagtailadmin_collections:delete",
+            args=(self.collection.id,),
+        )
+        self.assertContains(response, delete_url)
         self.assertBreadcrumbsItemsRendered(
             [
                 {"url": "/admin/collections/", "label": "Collections"},
@@ -501,7 +505,11 @@ class TestEditCollection(CollectionInstanceTestUtils, WagtailTestUtils, TestCase
         response = self.get(collection_id=self.marketing_collection.id)
         self.assertEqual(response.status_code, 200)
         self.assertEqual(list(response.context["form"].fields.keys()), ["name"])
-        self.assertNotContains(response, "Delete collection")
+        delete_url = reverse(
+            "wagtailadmin_collections:delete",
+            args=(self.marketing_collection.id,),
+        )
+        self.assertNotContains(response, delete_url)
 
     def test_cannot_move_collection_permissions_are_assigned_to_with_minimal_permission(
         self,
@@ -552,9 +560,13 @@ class TestEditCollection(CollectionInstanceTestUtils, WagtailTestUtils, TestCase
         self.test_marketing_user_cannot_move_collection_permissions_are_assigned_to_post()
 
     def test_page_shows_delete_link_only_if_delete_permitted(self):
+        delete_url = reverse(
+            "wagtailadmin_collections:delete",
+            args=(self.marketing_sub_collection.id,),
+        )
         # Retrieve edit form and check fields
         response = self.get(collection_id=self.marketing_sub_collection.id)
-        self.assertNotContains(response, "Delete collection")
+        self.assertNotContains(response, delete_url)
 
         # Add delete permission to a different collection and try again,
         # ensure that it checks against the tree structure, and not just a
@@ -566,7 +578,7 @@ class TestEditCollection(CollectionInstanceTestUtils, WagtailTestUtils, TestCase
             permission=self.delete_permission,
         )
         response = self.get(collection_id=self.marketing_sub_collection.id)
-        self.assertNotContains(response, "Delete collection")
+        self.assertNotContains(response, delete_url)
 
         # Add delete permission to parent collection and try again
         GroupCollectionPermission.objects.create(
@@ -575,7 +587,7 @@ class TestEditCollection(CollectionInstanceTestUtils, WagtailTestUtils, TestCase
             permission=self.delete_permission,
         )
         response = self.get(collection_id=self.marketing_sub_collection.id)
-        self.assertContains(response, "Delete collection")
+        self.assertContains(response, delete_url)
 
 
 class TestDeleteCollectionAsSuperuser(

wagtail/admin/tests/test_dashboard.py

@@ -229,7 +229,7 @@ class TestLockedPagesQueryCount(WagtailTestUtils, TestCase):
         # Warm up the cache
         html = panel.render_html(parent_context)
 
-        with self.assertNumQueries(1):
+        with self.assertNumQueries(7):
             html = panel.render_html(parent_context)
         soup = self.get_soup(html)
         # Should be sorted descending by locked_at

wagtail/admin/tests/test_edit_handlers.py

@@ -1,6 +1,7 @@
+from collections.abc import Mapping
 from datetime import date, datetime, timezone
 from functools import wraps
-from typing import Any, List, Mapping, Optional
+from typing import Any, Optional
 from unittest import mock
 
 from django import forms
@@ -846,7 +847,7 @@ class TestFieldPanel(TestCase):
     def _get_form(
         self,
         data: Optional[Mapping[str, Any]] = None,
-        fields: Optional[List[str]] = None,
+        fields: Optional[list[str]] = None,
     ) -> WagtailAdminPageForm:
         cls = get_form_for_model(
             EventPage,

wagtail/admin/tests/test_icon_sprite.py

@@ -11,6 +11,10 @@ class TestIconSpriteView(SimpleTestCase):
         )
         self.assertEqual(response.wsgi_request.GET["h"], get_icon_sprite_hash())
 
+    def test_no_comments(self):
+        response = self.client.get(get_icon_sprite_url())
+        self.assertNotContains(response, "<!--")
+
 
 class TestIconSpriteHash(SimpleTestCase):
     def test_hash(self):

wagtail/admin/tests/test_privacy.py

@@ -1,5 +1,3 @@
-import json
-
 from django.contrib.auth.models import Group
 from django.test import TestCase, override_settings
 from django.urls import reverse
@@ -116,27 +114,15 @@ class TestSetPrivacyView(WagtailTestUtils, TestCase):
 
         # Check response
         self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed(
-            response, "wagtailadmin/page_privacy/ancestor_privacy.html"
-        )
-        self.assertContains(
-            response, "This page has been made private by a parent page."
-        )
-        self.assertEqual(
-            response.context["page_with_restriction"].specific, self.private_page
-        )
-        # Should render without any heading, as the dialog already has a heading
-        soup = self.get_soup(json.loads(response.content)["html"])
-        self.assertIsNone(soup.select_one("header"))
-        self.assertIsNone(soup.select_one("h1"))
-
-        # Should link to the edit page for the collection with the restriction
-        link = soup.select_one("a")
         parent_edit_url = reverse(
             "wagtailadmin_pages:edit",
             args=(self.private_page.pk,),
         )
-        self.assertEqual(link.get("href"), parent_edit_url)
+        html = response.json()["html"]
+        self.assertIn(
+            f'<span>Privacy is inherited from the ancestor page - <a href="{parent_edit_url }">Private page (simple page)</a></span>',
+            html,
+        )
 
     def test_set_password_restriction(self):
         """

wagtail/admin/tests/test_reports_views.py

@@ -194,7 +194,7 @@ class TestLockedPagesView(BaseReportViewTestCase):
         self.assertActiveFilterNotRendered(soup)
 
         # Locked by current user shown in indicator
-        self.assertContains(response, "locked-indicator indicator--is-inverse")
+        self.assertNotContains(response, "indicator--is-dimmed")
         self.assertContains(
             response, 'title="This page is locked, by you, to further editing"'
         )

wagtail/admin/tests/test_site_summary.py

@@ -57,11 +57,11 @@ class TestPagesSummary(WagtailTestUtils, TestCase):
         self.assertSummaryContainsLinkToPage(self.wagtail_root.pk)
 
     def test_summary_includes_page_count_without_wagtail_root(self):
-        self.assertSummaryContains(f"<span>{Page.objects.count() - 1}</span> Pages")
+        self.assertSummaryContains(f"{Page.objects.count() - 1} Pages")
 
     def test_summary_shows_zero_pages_if_none_exist_except_wagtail_root(self):
         Page.objects.exclude(pk=self.wagtail_root.pk).delete()
-        self.assertSummaryContains("<span>0</span> Pages")
+        self.assertSummaryContains("0 Pages")
 
     def test_user_with_no_page_permissions_is_not_shown_panel(self):
         self.user.is_superuser = False
@@ -78,4 +78,4 @@ class TestPagesSummary(WagtailTestUtils, TestCase):
         self.user.is_superuser = False
         self.user.save()
         self.user.groups.add(self.test_page_group)
-        self.assertSummaryContains("<span>1</span> Page")
+        self.assertSummaryContains("1 Page")