wagtail 6.0.2__py3-none-any.whl → 6.1rc2__py3-none-any.whl

wagtail/admin/tests/pages/test_page_usage.py

@@ -8,9 +8,13 @@ from wagtail.test.testapp.models import (
     SimplePage,
 )
 from wagtail.test.utils import WagtailTestUtils
+from wagtail.test.utils.template_tests import AdminTemplateTestUtils
 
 
-class TestPageUsage(WagtailTestUtils, TestCase):
+class TestPageUsage(AdminTemplateTestUtils, WagtailTestUtils, TestCase):
+    # We don't show the "Home" breadcrumb item in page views
+    base_breadcrumb_items = []
+
     def setUp(self):
         self.user = self.login()
         self.root_page = Page.objects.get(id=2)
@@ -24,7 +28,7 @@ class TestPageUsage(WagtailTestUtils, TestCase):
         page.save_revision().publish()
         self.page = SimplePage.objects.get(id=page.id)
 
-    def test_no_usage(self):
+    def test_simple(self):
         usage_url = reverse("wagtailadmin_pages:usage", args=(self.page.id,))
         response = self.client.get(usage_url)
 
@@ -33,6 +37,37 @@ class TestPageUsage(WagtailTestUtils, TestCase):
         self.assertContains(response, "Usage")
         self.assertContains(response, "Hello world!")
 
+        items = [
+            {
+                "url": reverse("wagtailadmin_explore_root"),
+                "label": "Root",
+            },
+            {
+                "url": reverse("wagtailadmin_explore", args=(self.root_page.id,)),
+                "label": "Welcome to your new Wagtail site!",
+            },
+            {
+                "url": reverse("wagtailadmin_explore", args=(self.page.id,)),
+                "label": "Hello world! (simple page)",
+            },
+            {
+                "url": "",
+                "label": "Usage",
+                "sublabel": "Hello world! (simple page)",
+            },
+        ]
+        self.assertBreadcrumbsItemsRendered(items, response.content)
+
+        # There should be exactly one edit link, rendered as a header button
+        edit_url = reverse("wagtailadmin_pages:edit", args=(self.page.id,))
+        soup = self.get_soup(response.content)
+        edit_links = soup.select(f"a[href='{edit_url}']")
+        self.assertEqual(len(edit_links), 1)
+        edit_link = edit_links[0]
+        classes = edit_link.attrs.get("class")
+        self.assertIn("w-header-button", classes)
+        self.assertIn("button", classes)
+
     def test_has_private_usage(self):
         PageChooserModel.objects.create(page=self.page)
         usage_url = reverse("wagtailadmin_pages:usage", args=(self.page.id,))
@@ -72,3 +107,16 @@ class TestPageUsage(WagtailTestUtils, TestCase):
         )
         self.assertContains(response, "Thank you redirect page")
         self.assertContains(response, "<td>Form page with redirect</td>", html=True)
+
+    def test_pagination(self):
+        for _ in range(50):
+            PageChooserModel.objects.create(page=self.page)
+
+        usage_url = reverse("wagtailadmin_pages:usage", args=(self.page.id,))
+        response = self.client.get(f"{usage_url}?p=2")
+
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, "wagtailadmin/generic/listing.html")
+        self.assertContains(response, "Page 2 of 3.")
+        self.assertContains(response, f"{usage_url}?p=1")
+        self.assertContains(response, f"{usage_url}?p=3")

wagtail/admin/tests/pages/test_parent_page_chooser_view.py

@@ -0,0 +1,119 @@
+from django.contrib.auth.models import Group, Permission
+from django.test import TestCase
+from django.urls import reverse
+
+from wagtail.models import GroupPagePermission, Page
+from wagtail.test.testapp.models import BusinessIndex
+from wagtail.test.utils import WagtailTestUtils
+from wagtail.test.utils.template_tests import AdminTemplateTestUtils
+
+
+class TestParentPageChooserView(AdminTemplateTestUtils, WagtailTestUtils, TestCase):
+    fixtures = ["test.json"]
+
+    def setUp(self):
+        super().setUp()
+        self.user = self.login()
+        self.view_url = reverse("event_pages:choose_parent")
+
+    def test_get_page_parent_chooser(self):
+        response = self.client.get(self.view_url)
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, "wagtailadmin/pages/choose_parent.html")
+        self.assertBreadcrumbsItemsRendered(
+            [
+                {"url": reverse("event_pages:index"), "label": "Event pages"},
+                {"url": "", "label": "Choose parent", "sublabel": "Event page"},
+            ],
+            response.content,
+        )
+
+    def test_parent_chooser_redirect(self):
+        parent_page = Page.objects.first()
+        form_data = {
+            "parent_page": parent_page.pk,
+        }
+
+        response = self.client.post(self.view_url, form_data)
+        self.assertRedirects(
+            response,
+            reverse(
+                "wagtailadmin_pages:add", args=("tests", "eventpage", parent_page.pk)
+            ),
+        )
+
+        # Test another parent to make sure everything is working as intended
+        another_parent = parent_page.get_first_child()
+        form_data["parent_page"] = another_parent.pk
+
+        response = self.client.post(self.view_url, form_data)
+        self.assertRedirects(
+            response,
+            reverse(
+                "wagtailadmin_pages:add", args=("tests", "eventpage", another_parent.pk)
+            ),
+        )
+
+    def test_no_parent_selected(self):
+        error_html = """<p class="error-message">This field is required.</p>"""
+
+        response = self.client.post(self.view_url)
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, error_html, html=True)
+
+    def test_user_no_add_subpage_permission(self):
+        parent_page = Page.objects.first()
+        test_group = Group.objects.create(name="test_group")
+        test_group.permissions.add(Permission.objects.get(codename="access_admin"))
+
+        page_with_add_permission = Page(title="Page not to be selected")
+        page_with_no_permission = Page(title="Page to be selected")
+        parent_page.add_child(instance=page_with_add_permission)
+        parent_page.add_child(instance=page_with_no_permission)
+
+        GroupPagePermission.objects.create(
+            group=test_group,
+            page=page_with_add_permission,
+            permission_type="add",
+        )
+        form_data = {
+            "parent_page": page_with_no_permission.pk,
+        }
+
+        self.user.is_superuser = False
+        self.user.groups.add(test_group)
+        self.user.save()
+
+        response = self.client.post(self.view_url, form_data)
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(
+            response,
+            " You do not have permission to create a page under &quot;%s&quot;. "
+            % page_with_no_permission.get_admin_display_title(),
+        )
+
+        form_data["parent_page"] = page_with_add_permission.pk
+        response = self.client.post(self.view_url, form_data)
+        self.assertRedirects(
+            response,
+            reverse(
+                "wagtailadmin_pages:add",
+                args=("tests", "eventpage", page_with_add_permission.pk),
+            ),
+        )
+
+    def test_choosing_parent_with_unsupported_subpage_type(self):
+        parent_page = Page.objects.first()
+        page_with_limited_subtypes = BusinessIndex(title="EventPage unsupported")
+        parent_page.add_child(instance=page_with_limited_subtypes)
+        form_data = {
+            "parent_page": page_with_limited_subtypes.pk,
+        }
+
+        response = self.client.post(self.view_url, form_data)
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(
+            response,
+            "You cannot create a page of type &quot;Event page&quot; under &quot;%s&quot;."
+            % page_with_limited_subtypes.get_admin_display_title(),
+        )

wagtail/admin/tests/pages/test_preview.py

@@ -447,10 +447,16 @@ class TestEnablePreview(WagtailTestUtils, TestCase):
         self.assertEqual(response.status_code, 200)
 
         # Should show the preview panel
-        self.assertContains(response, 'data-side-panel-toggle="preview"')
         self.assertContains(response, 'data-side-panel="preview"')
         self.assertContains(response, 'data-action="%s"' % preview_url)
 
+        # Should have the preview side panel toggle button
+        soup = self.get_soup(response.content)
+        toggle_button = soup.find("button", {"data-side-panel-toggle": "preview"})
+        self.assertIsNotNone(toggle_button)
+        self.assertEqual("w-tooltip w-kbd", toggle_button["data-controller"])
+        self.assertEqual("mod+p", toggle_button["data-w-kbd-key-value"])
+
         # Should show the iframe
         self.assertContains(
             response,
@@ -571,8 +577,11 @@ class TestEnablePreview(WagtailTestUtils, TestCase):
         )
 
         response = self.client.get(history_url)
-        self.assertContains(response, "Preview")
-        self.assertContains(response, preview_url)
+        soup = self.get_soup(response.content)
+
+        preview_link = soup.find("a", {"href": preview_url})
+        self.assertEqual(len(preview_link), 1)
+        self.assertEqual("Preview", preview_link.text)
 
 
 class TestDisablePreviewButton(WagtailTestUtils, TestCase):
@@ -635,5 +644,10 @@ class TestDisablePreviewButton(WagtailTestUtils, TestCase):
             "wagtailadmin_pages:revisions_view",
             args=(stream_page.id, latest_revision.id),
         )
-        self.assertNotContains(response, "Preview")
+
         self.assertNotContains(response, preview_url)
+
+        soup = self.get_soup(response.content)
+
+        preview_link = soup.find("a", {"href": preview_url})
+        self.assertIsNone(preview_link)

wagtail/admin/tests/test_account_management.py

@@ -231,6 +231,7 @@ class TestAccountSectionUtilsMixin:
             "locale-preferred_language": "es",
             "locale-current_time_zone": "Europe/London",
             "theme-theme": "dark",
+            "theme-density": "default",
         }
         post_data.update(extra_post_data)
         return self.client.post(reverse("wagtailadmin_account"), post_data)
@@ -476,7 +477,10 @@ class TestAccountSection(WagtailTestUtils, TestCase, TestAccountSectionUtilsMixi
 
         # check that the updated language preference is now indicated in HTML header
         response = self.client.get(reverse("wagtailadmin_home"))
-        self.assertContains(response, '<html lang="es" dir="ltr" class="w-theme-dark">')
+        self.assertContains(
+            response,
+            '<html lang="es" dir="ltr" class="w-theme-dark w-density-default">',
+        )
 
     def test_unset_language_preferences(self):
         profile = UserProfile.get_for_user(self.user)
@@ -602,6 +606,21 @@ class TestAccountSection(WagtailTestUtils, TestCase, TestAccountSectionUtilsMixi
 
         self.assertEqual(profile.theme, "light")
 
+    def test_change_density_post(self):
+        response = self.post_form(
+            {
+                "theme-density": "snug",
+            }
+        )
+
+        # 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.density, "snug")
+
     def test_sensitive_post_parameters(self):
         request = RequestFactory().post("wagtailadmin_account", data={})
         request.user = self.user

wagtail/admin/tests/test_audit_log.py

@@ -7,13 +7,17 @@ from django.urls import reverse
 from django.utils import timezone
 from freezegun import freeze_time
 
+from wagtail.log_actions import log
 from wagtail.models import GroupPagePermission, Page, PageLogEntry, PageViewRestriction
 from wagtail.test.testapp.models import SimplePage
 from wagtail.test.utils import WagtailTestUtils
+from wagtail.test.utils.template_tests import AdminTemplateTestUtils
 from wagtail.utils.timestamps import render_timestamp
 
 
-class TestAuditLogAdmin(WagtailTestUtils, TestCase):
+class TestAuditLogAdmin(AdminTemplateTestUtils, WagtailTestUtils, TestCase):
+    base_breadcrumb_items = []
+
     def setUp(self):
         self.root_page = Page.objects.get(id=2)
 
@@ -74,6 +78,39 @@ class TestAuditLogAdmin(WagtailTestUtils, TestCase):
             restriction.save(user=self.administrator)
             restriction.delete()
 
+    def test_simple(self):
+        history_url = reverse(
+            "wagtailadmin_pages:history", kwargs={"page_id": self.hello_page.id}
+        )
+
+        self.login(user=self.administrator)
+
+        response = self.client.get(history_url)
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, "wagtailadmin/pages/history.html")
+        self.assertTemplateUsed(response, "wagtailadmin/generic/listing.html")
+
+        items = [
+            {
+                "url": reverse("wagtailadmin_explore_root"),
+                "label": "Root",
+            },
+            {
+                "url": reverse("wagtailadmin_explore", args=(self.root_page.id,)),
+                "label": "Welcome to your new Wagtail site!",
+            },
+            {
+                "url": reverse("wagtailadmin_explore", args=(self.hello_page.id,)),
+                "label": "Hello world! (simple page)",
+            },
+            {
+                "url": "",
+                "label": "History",
+                "sublabel": "Hello world! (simple page)",
+            },
+        ]
+        self.assertBreadcrumbsItemsRendered(items, response.content)
+
     def test_page_history(self):
         self._update_page(self.hello_page)
 
@@ -95,15 +132,15 @@ class TestAuditLogAdmin(WagtailTestUtils, TestCase):
 
         self.assertContains(
             response,
-            "Added the 'Private, accessible to logged-in users' view restriction",
+            "Added the 'Private, accessible to any logged-in users' view restriction",
         )
         self.assertContains(
             response,
-            "Updated the view restriction to 'Private, accessible with the following password'",
+            "Updated the view restriction to 'Private, accessible with a shared password'",
         )
         self.assertContains(
             response,
-            "Removed the 'Private, accessible with the following password' view restriction",
+            "Removed the 'Private, accessible with a shared password' view restriction",
         )
 
         self.assertContains(
@@ -123,14 +160,93 @@ class TestAuditLogAdmin(WagtailTestUtils, TestCase):
         history_url = reverse(
             "wagtailadmin_pages:history", kwargs={"page_id": self.hello_page.id}
         )
-        response = self.client.get(history_url + "?action=wagtail.edit")
+
+        # Should allow filtering by multiple actions
+        response = self.client.get(
+            f"{history_url}?action=wagtail.edit&action=wagtail.lock"
+        )
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, "Draft saved", count=2)
+        self.assertContains(response, "Locked")
+        self.assertNotContains(response, "Unlocked")
+        self.assertNotContains(response, "Page scheduled for publishing")
+        self.assertNotContains(response, "Published")
+
+        # Should render the active filter pills separately for each action
+        soup = self.get_soup(response.content)
+        active_filters = soup.select('[data-w-active-filter-id="id_action"]')
+        self.assertCountEqual(
+            [filter.get_text(separator=" ", strip=True) for filter in active_filters],
+            ["Action: Edit", "Action: Lock"],
+        )
+
+    def test_is_commenting_action_filters(self):
+        self.login(user=self.editor)
+        self._update_page(self.hello_page)
+
+        history_url = reverse(
+            "wagtailadmin_pages:history", kwargs={"page_id": self.hello_page.id}
+        )
+
+        log(
+            instance=self.hello_page,
+            action="wagtail.comments.create",
+            user=self.editor,
+            revision=self.hello_page.latest_revision,
+            data={
+                "comment": {
+                    "id": 123,
+                    "contentpath": "content",
+                    "text": "A comment that was added",
+                }
+            },
+        )
+
+        log(
+            instance=self.hello_page,
+            action="wagtail.comments.edit",
+            user=self.editor,
+            revision=self.hello_page.latest_revision,
+            data={
+                "comment": {
+                    "id": 123,
+                    "contentpath": "content",
+                    "text": "A comment that was edited",
+                }
+            },
+        )
+
+        # Without the filter applied
+        response = self.client.get(history_url)
         self.assertEqual(response.status_code, 200)
         self.assertContains(response, "Draft saved", count=2)
+        self.assertContains(response, "Locked")
+        self.assertContains(response, "Unlocked")
+        self.assertContains(response, "Page scheduled for publishing")
+        self.assertContains(response, "Published")
+
+        # Filter to only commenting actions
+        response = self.client.get(history_url + "?is_commenting_action=true")
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, "A comment that was added")
+        self.assertContains(response, "A comment that was edited")
+        self.assertNotContains(response, "Draft saved")
         self.assertNotContains(response, "Locked")
         self.assertNotContains(response, "Unlocked")
         self.assertNotContains(response, "Page scheduled for publishing")
         self.assertNotContains(response, "Published")
 
+        # Filter to only non-commenting actions
+        response = self.client.get(history_url + "?is_commenting_action=false")
+        self.assertEqual(response.status_code, 200)
+        self.assertNotContains(response, "A comment that was added")
+        self.assertNotContains(response, "A comment that was edited")
+        self.assertContains(response, "Draft saved")
+        self.assertContains(response, "Locked")
+        self.assertContains(response, "Unlocked")
+        self.assertContains(response, "Page scheduled for publishing")
+        self.assertContains(response, "Published")
+
     def test_site_history(self):
         self._update_page(self.hello_page)
         self.about_page.save_revision(user=self.administrator, log_action=True)
@@ -328,3 +444,54 @@ class TestAuditLogAdmin(WagtailTestUtils, TestCase):
             response,
             f"Revision {revision.id} from {render_timestamp(revision.created_at)} unscheduled from publishing at {render_timestamp(go_live_at)}.",
         )
+
+    def test_num_queries(self):
+        self.login(user=self.editor)
+
+        history_url = reverse(
+            "wagtailadmin_pages:history", kwargs={"page_id": self.hello_page.id}
+        )
+
+        # Warm up the cache
+        self.client.get(history_url)
+
+        # Initial load, without any log entries
+        with self.assertNumQueries(17):
+            self.client.get(history_url)
+
+        # With some log entries
+        self._update_page(self.hello_page)
+        with self.assertNumQueries(19):
+            self.client.get(history_url)
+
+        # With even more log entries, should remain the same (no N+1 queries)
+        log(
+            instance=self.hello_page,
+            action="wagtail.comments.create",
+            user=self.editor,
+            revision=self.hello_page.latest_revision,
+            data={
+                "comment": {
+                    "id": 123,
+                    "contentpath": "content",
+                    "text": "A comment that was added",
+                }
+            },
+        )
+
+        log(
+            instance=self.hello_page,
+            action="wagtail.comments.edit",
+            user=self.editor,
+            revision=self.hello_page.latest_revision,
+            data={
+                "comment": {
+                    "id": 123,
+                    "contentpath": "content",
+                    "text": "A comment that was edited",
+                }
+            },
+        )
+        self._update_page(self.hello_page)
+        with self.assertNumQueries(19):
+            self.client.get(history_url)

wagtail/admin/tests/test_checks.py

@@ -0,0 +1,92 @@
+from django.core.checks import Error
+from django.test import TestCase, override_settings
+
+from wagtail.admin.checks import datetime_format_check
+from wagtail.test.utils import WagtailTestUtils
+
+
+class TestDateTimeChecks(WagtailTestUtils, TestCase):
+    fixtures = ["test.json"]
+
+    def test_datetime_format(self):
+        with override_settings(
+            WAGTAIL_CONTENT_LANGUAGES=[
+                ("en", "English"),
+            ],
+            LANGUAGES=[
+                ("en", "English"),
+            ],
+            WAGTAIL_DATE_FORMAT="%m/%d/%Y",
+            WAGTAIL_TIME_FORMAT="%H:%M",
+            USE_L10N=True,
+        ):
+            errors = datetime_format_check(None)
+
+        self.assertEqual(errors, [])
+
+    def test_datetime_format_with_unsupported_date(self):
+        with override_settings(
+            WAGTAIL_CONTENT_LANGUAGES=[
+                ("en", "English"),
+            ],
+            LANGUAGES=[
+                ("en", "English"),
+            ],
+            WAGTAIL_DATE_FORMAT="%d.%m.%Y.",
+            WAGTAIL_TIME_FORMAT="%H:%M",
+            USE_L10N=True,
+        ):
+            errors = datetime_format_check(None)
+
+        expected_errors = [
+            Error(
+                "Configuration error",
+                hint="WAGTAIL_DATE_FORMAT %d.%m.%Y. must be in DATE_INPUT_FORMATS for language English (en).",
+            )
+        ]
+        self.assertEqual(errors, expected_errors)
+
+    def test_datetime_format_with_unsupported_date_not_using_l10n(self):
+        """
+        Test that the check doesn't raise an error when USE_L10N is False.
+        """
+
+        with override_settings(
+            WAGTAIL_CONTENT_LANGUAGES=[
+                ("en", "English"),
+            ],
+            LANGUAGES=[
+                ("en", "English"),
+            ],
+            WAGTAIL_DATE_FORMAT="%d.%m.%Y.",
+            WAGTAIL_TIME_FORMAT="%H:%M",
+            USE_L10N=False,
+        ):
+            errors = datetime_format_check(None)
+        self.assertEqual(errors, [])
+
+    def test_datetime_format_with_unsupported_datetime_and_time(self):
+        with override_settings(
+            WAGTAIL_CONTENT_LANGUAGES=[
+                ("en", "English"),
+            ],
+            LANGUAGES=[
+                ("en", "English"),
+            ],
+            WAGTAIL_DATETIME_FORMAT="%d.%m.%Y. %H:%M",
+            WAGTAIL_TIME_FORMAT="%I:%M %p",
+            USE_L10N=True,
+        ):
+            errors = datetime_format_check(None)
+
+        expected_errors = [
+            Error(
+                "Configuration error",
+                hint="WAGTAIL_DATETIME_FORMAT %d.%m.%Y. %H:%M must be in DATETIME_INPUT_FORMATS for language English (en).",
+            ),
+            Error(
+                "Configuration error",
+                hint="WAGTAIL_TIME_FORMAT %I:%M %p must be in TIME_INPUT_FORMATS for language English (en).",
+            ),
+        ]
+        self.assertEqual(errors, expected_errors)

wagtail/admin/tests/test_collections_views.py

@@ -55,7 +55,7 @@ class TestCollectionsIndexViewAsSuperuser(
     def test_simple(self):
         response = self.get()
         self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed(response, "wagtailadmin/collections/index.html")
+        self.assertTemplateUsed(response, "wagtailadmin/generic/index.html")
 
         # Initially there should be no collections listed
         # (Root should not be shown)
@@ -67,10 +67,12 @@ class TestCollectionsIndexViewAsSuperuser(
         # Now the listing should contain our collection
         response = self.get()
         self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed(response, "wagtailadmin/collections/index.html")
+        self.assertTemplateUsed(response, "wagtailadmin/generic/index.html")
         self.assertNotContains(response, "No collections have been created.")
         self.assertContains(response, "Holiday snaps")
-        self.assertBreadcrumbsNotRendered(response.content)
+        self.assertBreadcrumbsItemsRendered(
+            [{"url": "", "label": "Collections"}], response.content
+        )
 
     def test_ordering(self):
         root_collection = Collection.get_first_root_node()
@@ -205,7 +207,13 @@ class TestAddCollectionAsSuperuser(AdminTemplateTestUtils, WagtailTestUtils, Tes
         response = self.get()
         self.assertEqual(response.status_code, 200)
         self.assertContains(response, self.root_collection.name)
-        self.assertBreadcrumbsNotRendered(response.content)
+        self.assertBreadcrumbsItemsRendered(
+            [
+                {"label": "Collections", "url": "/admin/collections/"},
+                {"label": "New: Collection", "url": ""},
+            ],
+            response.content,
+        )
 
     def test_post(self):
         response = self.post(
@@ -324,7 +332,13 @@ class TestEditCollectionAsSuperuser(AdminTemplateTestUtils, WagtailTestUtils, Te
         response = self.get()
         self.assertEqual(response.status_code, 200)
         self.assertContains(response, "Delete collection")
-        self.assertBreadcrumbsNotRendered(response.content)
+        self.assertBreadcrumbsItemsRendered(
+            [
+                {"url": "/admin/collections/", "label": "Collections"},
+                {"url": "", "label": str(self.collection)},
+            ],
+            response.content,
+        )
 
     def test_cannot_edit_root_collection(self):
         response = self.get(collection_id=self.root_collection.id)