wagtail 7.0.2__py3-none-any.whl → 7.1rc1__py3-none-any.whl

wagtail/admin/tests/test_buttons_hooks.py

@@ -10,6 +10,7 @@ from wagtail.admin.widgets.button import Button
 from wagtail.models import Page
 from wagtail.test.testapp.models import SimplePage
 from wagtail.test.utils import WagtailTestUtils
+from wagtail.utils.deprecation import RemovedInWagtail80Warning
 
 
 class TestButtonsHooks(WagtailTestUtils, TestCase):
@@ -27,12 +28,43 @@ class TestButtonsHooks(WagtailTestUtils, TestCase):
 
 
 class TestPageListingButtonsHooks(TestButtonsHooks):
+    def test_register_page_listing_buttons_deprecated_class(self):
+        def page_listing_buttons_deprecated_class(page, user, next_url=None):
+            yield wagtailadmin_widgets.PageListingButton(
+                "Another useless page listing button", "/custom-url", priority=10
+            )
+
+        with (
+            hooks.register_temporarily(
+                "register_page_listing_buttons", page_listing_buttons_deprecated_class
+            ),
+            self.assertWarnsMessage(
+                RemovedInWagtail80Warning,
+                "`PageListingButton` is deprecated. "
+                "Use `wagtail.admin.widgets.button.ListingButton` instead.",
+            ),
+        ):
+            response = self.client.get(
+                reverse("wagtailadmin_explore", args=(self.root_page.id,))
+            )
+
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(
+            response, "wagtailadmin/shared/button_with_dropdown.html"
+        )
+        self.assertTemplateUsed(
+            response, "wagtailadmin/pages/listing/_button_with_dropdown.html"
+        )
+        self.assertTemplateUsed(response, "wagtailadmin/shared/buttons.html")
+
+        self.assertContains(response, "Another useless page listing button")
+
     def test_register_page_listing_buttons_new_signature(self):
         def page_listing_buttons_new_signature(page, user, next_url=None):
             if not isinstance(user, AbstractBaseUser):
                 raise TypeError("expected a user instance")
 
-            yield wagtailadmin_widgets.PageListingButton(
+            yield wagtailadmin_widgets.ListingButton(
                 "Another useless page listing button", "/custom-url", priority=10
             )
 
@@ -44,6 +76,9 @@ class TestPageListingButtonsHooks(TestButtonsHooks):
             )
 
         self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(
+            response, "wagtailadmin/shared/button_with_dropdown.html"
+        )
         self.assertTemplateUsed(
             response, "wagtailadmin/pages/listing/_button_with_dropdown.html"
         )
@@ -72,6 +107,9 @@ class TestPageListingMoreButtonsHooks(TestButtonsHooks):
             )
 
         self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(
+            response, "wagtailadmin/shared/button_with_dropdown.html"
+        )
         self.assertTemplateUsed(
             response, "wagtailadmin/pages/listing/_button_with_dropdown.html"
         )
@@ -118,6 +156,9 @@ class TestPageListingMoreButtonsHooks(TestButtonsHooks):
             )
 
         self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(
+            response, "wagtailadmin/shared/button_with_dropdown.html"
+        )
         self.assertTemplateUsed(
             response, "wagtailadmin/pages/listing/_button_with_dropdown.html"
         )
@@ -146,6 +187,27 @@ class TestPageListingMoreButtonsHooks(TestButtonsHooks):
 
         self.assertEqual(delete_button.url, full_url)
 
+    def test_buttons_with_rel_attribute(self):
+        """
+        Ensure that PageMenuItem can specify a rel attribute for the link.
+        """
+        self.child_page.save_revision()
+        response = self.client.get(
+            reverse("wagtailadmin_explore", args=(self.root_page.id,))
+        )
+        self.assertEqual(response.status_code, 200)
+        soup = self.get_soup(response.content)
+        buttons = soup.select("td li [data-controller='w-dropdown'] a[rel]")
+        self.assertEqual(len(buttons), 2)
+        self.assertEqual(
+            {button.text.strip() for button in buttons},
+            {"View live", "View draft"},
+        )
+        self.assertEqual(
+            [button.get("rel") for button in buttons],
+            [["noreferrer"], ["noreferrer"]],
+        )
+
     def test_delete_button_with_invalid_next_url(self):
         """
         Ensure that the built in delete button on page listing will not use
@@ -184,7 +246,7 @@ class TestPageListingMoreButtonsHooks(TestButtonsHooks):
         buttons = [
             button
             for button in page_listing_more_buttons(page, user=editor)
-            if button.show
+            if button.is_shown(user=editor)
         ]
         self.assertEqual(
             len([button for button in buttons if button.label == "Sort menu order"]), 0
@@ -198,7 +260,7 @@ class TestPageListingMoreButtonsHooks(TestButtonsHooks):
         buttons = [
             button
             for button in page_listing_more_buttons(page, user=publisher)
-            if button.show
+            if button.is_shown(user=publisher)
         ]
         reorder_button = next(
             button for button in buttons if button.label == "Sort menu order"

wagtail/admin/tests/test_edit_handlers.py

@@ -436,7 +436,7 @@ class TestPanelAttributes(WagtailTestUtils, TestCase):
                     [
                         InlinePanel(
                             "speakers",
-                            label="Speakers",
+                            label="speaker",
                             attrs={"data-panel-type": "inline"},
                         ),
                     ],
@@ -533,7 +533,7 @@ class TestTabbedInterface(WagtailTestUtils, TestCase):
                 ),
                 ObjectList(
                     [
-                        InlinePanel("speakers", label="Speakers"),
+                        InlinePanel("speakers", label="speaker"),
                     ],
                     heading="Speakers",
                 ),
@@ -584,14 +584,17 @@ class TestTabbedInterface(WagtailTestUtils, TestCase):
 
         result = tabbed_interface.render_html()
 
+        soup = self.get_soup(result)
+
         # result should contain tab buttons
+
         self.assertIn(
-            '<a id="tab-label-event_details" href="#tab-event_details" class="w-tabs__tab shiny" role="tab" aria-selected="false" tabindex="-1">',
-            result,
+            '<a aria-selected="false" class="w-tabs__tab shiny" data-action="w-tabs#select:prevent" data-w-tabs-target="trigger" href="#tab-event_details" id="tab-label-event_details" role="tab" tabindex="-1">',
+            str(soup.find("a", {"id": "tab-label-event_details"})),
         )
         self.assertIn(
-            '<a id="tab-label-speakers" href="#tab-speakers" class="w-tabs__tab " role="tab" aria-selected="false" tabindex="-1">',
-            result,
+            '<a aria-selected="false" class="w-tabs__tab" data-action="w-tabs#select:prevent" data-w-tabs-target="trigger" href="#tab-speakers" id="tab-label-speakers" role="tab" tabindex="-1">',
+            str(soup.find("a", {"id": "tab-label-speakers"})),
         )
 
         # result should contain tab panels
@@ -647,26 +650,29 @@ class TestTabbedInterface(WagtailTestUtils, TestCase):
                 form=form,
                 request=self.request,
             )
+
             result = tabbed_interface.render_html()
+            soup = self.get_soup(result)
+
             self.assertIn(
-                '<a id="tab-label-event_details" href="#tab-event_details" class="w-tabs__tab shiny" role="tab" aria-selected="false" tabindex="-1">',
-                result,
+                '<a aria-selected="false" class="w-tabs__tab shiny" data-action="w-tabs#select:prevent" data-w-tabs-target="trigger" href="#tab-event_details" id="tab-label-event_details" role="tab" tabindex="-1">',
+                str(soup.find("a", {"id": "tab-label-event_details"})),
             )
             self.assertIn(
-                '<a id="tab-label-speakers" href="#tab-speakers" class="w-tabs__tab " role="tab" aria-selected="false" tabindex="-1">',
-                result,
+                '<a aria-selected="false" class="w-tabs__tab" data-action="w-tabs#select:prevent" data-w-tabs-target="trigger" href="#tab-speakers" id="tab-label-speakers" role="tab" tabindex="-1">',
+                str(soup.find("a", {"id": "tab-label-speakers"})),
             )
             self.assertIn(
-                '<a id="tab-label-secret" href="#tab-secret" ',
-                result,
+                'data-w-tabs-target="trigger" href="#tab-secret" id="tab-label-secret" role="tab"',
+                str(soup.find("a", {"id": "tab-label-secret"})),
             )
             self.assertIn(
-                '<a id="tab-label-custom_setting" href="#tab-custom_setting" ',
-                result,
+                'data-w-tabs-target="trigger" href="#tab-custom_setting" id="tab-label-custom_setting" role="tab"',
+                str(soup.find("a", {"id": "tab-label-custom_setting"})),
             )
             self.assertIn(
-                '<a id="tab-label-other_custom_setting" href="#tab-other_custom_setting" ',
-                result,
+                'data-w-tabs-target="trigger" href="#tab-other_custom_setting" id="tab-label-other_custom_setting" role="tab"',
+                str(soup.find("a", {"id": "tab-label-other_custom_setting"})),
             )
 
         with self.subTest("Not superuser permissions"):
@@ -681,26 +687,27 @@ class TestTabbedInterface(WagtailTestUtils, TestCase):
                 form=form,
                 request=self.request,
             )
+
             result = tabbed_interface.render_html()
+            soup = self.get_soup(result)
+
             self.assertIn(
-                '<a id="tab-label-event_details" href="#tab-event_details" class="w-tabs__tab shiny" role="tab" aria-selected="false" tabindex="-1">',
-                result,
+                '<a aria-selected="false" class="w-tabs__tab shiny" data-action="w-tabs#select:prevent" data-w-tabs-target="trigger" href="#tab-event_details" id="tab-label-event_details" role="tab" tabindex="-1">',
+                str(soup.find("a", {"id": "tab-label-event_details"})),
             )
             self.assertIn(
-                '<a id="tab-label-speakers" href="#tab-speakers" class="w-tabs__tab " role="tab" aria-selected="false" tabindex="-1">',
-                result,
+                '<a aria-selected="false" class="w-tabs__tab" data-action="w-tabs#select:prevent" data-w-tabs-target="trigger" href="#tab-speakers" id="tab-label-speakers" role="tab" tabindex="-1">',
+                str(soup.find("a", {"id": "tab-label-speakers"})),
             )
-            self.assertNotIn(
-                '<a id="tab-label-secret" href="#tab-secret" ',
-                result,
+            self.assertIsNone(
+                soup.find("a", {"id": "tab-label-secret"}),
             )
             self.assertIn(
-                '<a id="tab-label-custom_setting" href="#tab-custom_setting" ',
-                result,
+                'data-w-tabs-target="trigger" href="#tab-custom_setting" id="tab-label-custom_setting" role="tab"',
+                str(soup.find("a", {"id": "tab-label-custom_setting"})),
             )
-            self.assertNotIn(
-                '<a id="tab-label-other_custom_setting" href="#tab-other-custom_setting" ',
-                result,
+            self.assertIsNone(
+                soup.find("a", {"id": "tab-label-other_custom_setting"}),
             )
 
         with self.subTest("Non superuser"):
@@ -714,26 +721,26 @@ class TestTabbedInterface(WagtailTestUtils, TestCase):
                 form=form,
                 request=self.request,
             )
+
             result = tabbed_interface.render_html()
+            soup = self.get_soup(result)
+
             self.assertIn(
-                '<a id="tab-label-event_details" href="#tab-event_details" class="w-tabs__tab shiny" role="tab" aria-selected="false" tabindex="-1">',
-                result,
+                '<a aria-selected="false" class="w-tabs__tab shiny" data-action="w-tabs#select:prevent" data-w-tabs-target="trigger" href="#tab-event_details" id="tab-label-event_details" role="tab" tabindex="-1">',
+                str(soup.find("a", {"id": "tab-label-event_details"})),
             )
             self.assertIn(
-                '<a id="tab-label-speakers" href="#tab-speakers" class="w-tabs__tab " role="tab" aria-selected="false" tabindex="-1">',
-                result,
+                '<a aria-selected="false" class="w-tabs__tab" data-action="w-tabs#select:prevent" data-w-tabs-target="trigger" href="#tab-speakers" id="tab-label-speakers" role="tab" tabindex="-1">',
+                str(soup.find("a", {"id": "tab-label-speakers"})),
             )
-            self.assertNotIn(
-                '<a id="tab-label-secret" href="#tab-secret" ',
-                result,
+            self.assertIsNone(
+                soup.find("a", {"id": "tab-label-secret"}),
             )
-            self.assertNotIn(
-                '<a id="tab-label-custom_setting" href="#tab-custom_setting" ',
-                result,
+            self.assertIsNone(
+                soup.find("a", {"id": "tab-label-other_custom_setting"}),
             )
-            self.assertNotIn(
-                '<a id="tab-label-other_custom_setting" href="#tab-other-custom_setting" ',
-                result,
+            self.assertIsNone(
+                soup.find("a", {"id": "tab-label-custom_setting"}),
             )
 
 
@@ -748,7 +755,7 @@ class TestObjectList(TestCase):
                 FieldPanel("title", widget=forms.Textarea),
                 FieldPanel("date_from"),
                 FieldPanel("date_to"),
-                InlinePanel("speakers", label="Speakers"),
+                InlinePanel("speakers", label="speaker"),
             ],
             heading="Event details",
             classname="shiny",
@@ -1353,7 +1360,7 @@ class TestInlinePanel(WagtailTestUtils, TestCase):
             [
                 InlinePanel(
                     "speakers",
-                    label="Speakers",
+                    label="speaker",
                     classname="classname-for-speakers",
                     attrs={"data-controller": "test"},
                 )
@@ -1415,7 +1422,7 @@ class TestInlinePanel(WagtailTestUtils, TestCase):
         )
 
         # rendered panel must include the JS initializer
-        self.assertIn("var panel = new InlinePanel({", result)
+        self.assertIn("var panel = new InlinePanel(", result)
 
         # rendered panel must have data-contentpath-disabled attribute by default
         self.assertIn("data-contentpath-disabled", result)
@@ -1432,7 +1439,7 @@ class TestInlinePanel(WagtailTestUtils, TestCase):
             [
                 InlinePanel(
                     "speakers",
-                    label="Speakers",
+                    label="speaker",
                     panels=[
                         FieldPanel("first_name", widget=forms.Textarea),
                         FieldPanel("image"),
@@ -1505,7 +1512,7 @@ class TestInlinePanel(WagtailTestUtils, TestCase):
         )
 
         # render_js_init must provide the JS initializer
-        self.assertIn("var panel = new InlinePanel({", panel.render_html())
+        self.assertIn("var panel = new InlinePanel(", panel.render_html())
 
     @override_settings(USE_L10N=True, USE_THOUSAND_SEPARATOR=True)
     def test_no_thousand_separators_in_js(self):
@@ -1519,7 +1526,7 @@ class TestInlinePanel(WagtailTestUtils, TestCase):
             [
                 InlinePanel(
                     "speakers",
-                    label="Speakers",
+                    label="speaker",
                     panels=[
                         FieldPanel("first_name", widget=forms.Textarea),
                         FieldPanel("image"),
@@ -1535,15 +1542,15 @@ class TestInlinePanel(WagtailTestUtils, TestCase):
             instance=event_page, form=form, request=self.request
         )
 
-        self.assertIn("maxForms: 1000", panel.render_html())
+        self.assertIn(r"\u0022maxForms\u0022: 1000", panel.render_html())
 
     def test_invalid_inlinepanel_declaration(self):
         with self.ignore_deprecation_warnings():
-            self.assertRaises(TypeError, lambda: InlinePanel(label="Speakers"))
+            self.assertRaises(TypeError, lambda: InlinePanel(label="speaker"))
             self.assertRaises(
                 TypeError,
                 lambda: InlinePanel(
-                    EventPage, "speakers", label="Speakers", bacon="chunky"
+                    EventPage, "speakers", label="speaker", bacon="chunky"
                 ),
             )
 
@@ -1552,13 +1559,13 @@ class TestInlinePanel(WagtailTestUtils, TestCase):
         # Heading is the plural term, derived from the relation's related_name
         self.assertEqual(panel.heading, "Social links")
         # Label is the singular term, derived from the related model's verbose_name
-        self.assertEqual(panel.label, "Social link")
+        self.assertEqual(panel.label, "social link")
 
     def test_inline_panel_order_with_min_num(self):
         event_page = EventPage.objects.get(slug="christmas")
 
         speaker_object_list = ObjectList(
-            [InlinePanel("speakers", label="Speakers", min_num=2)]
+            [InlinePanel("speakers", label="speaker", min_num=2)]
         ).bind_to_model(EventPage)
 
         EventPageForm = speaker_object_list.get_form_class()
@@ -1595,7 +1602,7 @@ class TestNonOrderableInlinePanel(WagtailTestUtils, TestCase):
             [
                 InlinePanel(
                     "social_links",
-                    label="Social Links",
+                    label="social link",
                 )
             ]
         ).bind_to_model(PersonPage)
@@ -2144,7 +2151,9 @@ class TestMultipleChooserPanel(WagtailTestUtils, TestCase):
         )
         self.assertEqual(response.status_code, 200)
         self.assertContains(response, 'name="gallery_images-TOTAL_FORMS"')
-        self.assertContains(response, 'chooserFieldName: "image"')
+        self.assertContains(
+            response, r"\u0022chooserFieldName\u0022: \u0022image\u0022"
+        )
 
 
 class TestMultipleChooserPanelGetComparison(TestCase):
@@ -2270,7 +2279,7 @@ class TestPanelIcons(WagtailTestUtils, TestCase):
     def test_override_inlinepanel_icon(self):
         cases = [
             (
-                InlinePanel("carousel_items", label="Carousey", icon="cogs"),
+                InlinePanel("carousel_items", label="carousey", icon="cogs"),
                 "cogs",
             ),
             (

wagtail/admin/tests/test_reports_views.py

@@ -60,10 +60,10 @@ class BaseReportViewTestCase(AdminTemplateTestUtils, WagtailTestUtils, TestCase)
     def setUp(self):
         self.user = self.login()
 
-    def get(self, params={}):
+    def get(self, params={}, **kwargs):
         if self.results_only:
             params["_w_filter_fragment"] = "true"
-        return self.client.get(self.url, params)
+        return self.client.get(self.url, params, **kwargs)
 
     def assertActiveFilter(self, soup, name, value):
         # Should render the export buttons inside the header "more" dropdown

wagtail/{tests → admin/tests}/test_telepath.py

@@ -2,7 +2,7 @@ import itertools
 
 from django.test import TestCase
 
-from wagtail.telepath import Adapter, JSContext, register
+from wagtail.admin.telepath import Adapter, JSContext, register
 
 
 class Artist:

wagtail/admin/tests/test_templatetags.py

@@ -13,10 +13,10 @@ from freezegun import freeze_time
 
 from wagtail.admin.staticfiles import VERSION_HASH, versioned_static
 from wagtail.admin.templatetags.wagtailadmin_tags import (
+    absolute_static,
     avatar_url,
     i18n_enabled,
     locale_label_from_id,
-    notification_static,
     timesince_last_update,
     timesince_simple,
 )
@@ -83,36 +83,38 @@ class TestAvatarTemplateTag(WagtailTestUtils, TestCase):
         self.assertIn("custom-avatar", url)
 
 
-class TestNotificationStaticTemplateTag(SimpleTestCase):
+class TestAbsoluteStaticTemplateTag(SimpleTestCase):
     @override_settings(STATIC_URL="/static/")
-    def test_local_notification_static(self):
-        url = notification_static("wagtailadmin/images/email-header.jpg")
-        self.assertEqual(
-            "{}/static/wagtailadmin/images/email-header.jpg".format(
-                settings.WAGTAILADMIN_BASE_URL
-            ),
-            url,
+    def test_local_absolute_static(self):
+        url = absolute_static("wagtailadmin/images/email-header.jpg")
+        expected = (
+            rf"^{settings.WAGTAILADMIN_BASE_URL}/static/wagtailadmin/images/"
+            r"email-header.jpg\?v=(\w{8})$"
         )
+        self.assertRegex(url, expected)
 
     @override_settings(
         STATIC_URL="/static/", WAGTAILADMIN_BASE_URL="http://localhost:8000"
     )
-    def test_local_notification_static_baseurl(self):
-        url = notification_static("wagtailadmin/images/email-header.jpg")
-        self.assertEqual(
-            "http://localhost:8000/static/wagtailadmin/images/email-header.jpg", url
+    def test_local_absolute_static_baseurl(self):
+        url = absolute_static("wagtailadmin/images/email-header.jpg")
+        expected = (
+            r"^http://localhost:8000/static/wagtailadmin/images/"
+            r"email-header.jpg\?v=(\w{8})$"
         )
+        self.assertRegex(url, expected)
 
     @override_settings(
         STATIC_URL="https://s3.amazonaws.com/somebucket/static/",
         WAGTAILADMIN_BASE_URL="http://localhost:8000",
     )
-    def test_remote_notification_static(self):
-        url = notification_static("wagtailadmin/images/email-header.jpg")
-        self.assertEqual(
-            "https://s3.amazonaws.com/somebucket/static/wagtailadmin/images/email-header.jpg",
-            url,
+    def test_remote_absolute_static(self):
+        url = absolute_static("wagtailadmin/images/email-header.jpg")
+        expected = (
+            r"https://s3.amazonaws.com/somebucket/static/wagtailadmin/images/"
+            r"email-header.jpg\?v=(\w{8})$"
         )
+        self.assertRegex(url, expected)
 
 
 class TestVersionedStatic(SimpleTestCase):