wagtail 7.2rc1__py3-none-any.whl → 7.3rc1__py3-none-any.whl

wagtail/admin/tests/pages/test_explorer_view.py

@@ -93,12 +93,16 @@ class TestPageExplorer(WagtailTestUtils, TestCase):
             count=3,
         )
 
+        # Should render bulk actions markup
         bulk_actions_js = versioned_static("wagtailadmin/js/bulk-actions.js")
-        self.assertContains(
-            response,
-            f'<script defer src="{bulk_actions_js}"></script>',
-            html=True,
-        )
+        soup = self.get_soup(response.content)
+        script = soup.select_one(f"script[src='{bulk_actions_js}']")
+        self.assertIsNotNone(script)
+        bulk_actions = soup.select("[data-bulk-action-button]")
+        self.assertTrue(bulk_actions)
+        # 'next' parameter is constructed client-side later based on filters state
+        for action in bulk_actions:
+            self.assertNotIn("next=", action["href"])
 
     def test_explore_results(self):
         explore_results_url = reverse(

wagtail/admin/tests/pages/test_page_search.py

@@ -6,6 +6,7 @@ from django.test import TransactionTestCase
 from django.urls import reverse
 from django.utils.http import urlencode
 
+from wagtail.admin.staticfiles import versioned_static
 from wagtail.models import Page
 from wagtail.test.testapp.models import EventIndex, SimplePage, SingleEventPage
 from wagtail.test.utils import WagtailTestUtils
@@ -338,3 +339,17 @@ class TestPageSearch(WagtailTestUtils, TransactionTestCase):
                     response,
                     f"{url}?q=&content_type=tests.eventindex",
                 )
+
+    def test_bulk_action_rendered(self):
+        response = self.get()
+        self.assertEqual(response.status_code, 200)
+        # Should render bulk actions markup
+        bulk_actions_js = versioned_static("wagtailadmin/js/bulk-actions.js")
+        soup = self.get_soup(response.content)
+        script = soup.select_one(f"script[src='{bulk_actions_js}']")
+        self.assertIsNotNone(script)
+        bulk_actions = soup.select("[data-bulk-action-button]")
+        self.assertTrue(bulk_actions)
+        # 'next' parameter is constructed client-side later based on filters state
+        for action in bulk_actions:
+            self.assertNotIn("next=", action["href"])

wagtail/admin/tests/pages/test_preview.py

@@ -414,6 +414,36 @@ class TestPreview(WagtailTestUtils, TestCase):
         self.assertContains(response, "<li>Parties</li>")
         self.assertContains(response, "<li>Holidays</li>")
 
+        soup = self.get_soup(response.content)
+        userbar = soup.select_one("wagtail-userbar")
+        self.assertIsNotNone(userbar)
+        template = soup.select_one("#wagtail-userbar-template")
+        self.assertIsNotNone(template)
+
+        # Previews use a dummy request object, so the userbar should use
+        # relative URLs to avoid using the wrong host.
+        admin_url = reverse("wagtailadmin_home")
+        admin_link = template.select_one(f'a[href$="{admin_url}"]')
+        self.assertIsNotNone(admin_link)
+        self.assertEqual(admin_link["href"], admin_url)
+
+        css_links = soup.select("link[rel='stylesheet']")
+        self.assertEqual(
+            [link.get("href") for link in css_links],
+            [
+                versioned_static("wagtailadmin/css/core.css"),
+                "/path/to/my/custom.css",
+            ],
+        )
+        scripts = soup.select("script[src]")
+        self.assertEqual(
+            [script.get("src") for script in scripts],
+            [
+                versioned_static("wagtailadmin/js/vendor.js"),
+                versioned_static("wagtailadmin/js/userbar.js"),
+            ],
+        )
+
     def test_preview_on_edit_with_valid_then_invalid_data(self):
         preview_url = reverse(
             "wagtailadmin_pages:preview_on_edit", args=(self.event_page.id,)

wagtail/admin/tests/pages/test_revisions.py

@@ -130,6 +130,10 @@ class TestRevisions(WagtailTestUtils, TestCase):
                 args=(self.christmas_event.id, self.last_christmas_revision.id),
             ),
         )
+        # Autosave should be disabled
+        self.assertNotIn("w-autosave", form["data-controller"].split())
+        self.assertNotIn("w-autosave", form["data-action"])
+        self.assertIsNone(form.attrs.get("data-w-autosave-interval-value"))
 
         # Buttons should be relabelled
         self.assertContains(response, "Replace current draft")

wagtail/admin/tests/test_account_management.py

@@ -1,3 +1,4 @@
+import io
 import unittest
 import zoneinfo
 
@@ -10,7 +11,9 @@ from django.core import mail
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.test import RequestFactory, TestCase, override_settings
 from django.urls import reverse
+from PIL import Image
 
+from wagtail.admin.forms.account import AvatarPreferencesForm
 from wagtail.admin.localization import (
     WAGTAILADMIN_PROVIDED_LANGUAGES,
     get_available_admin_languages,
@@ -733,6 +736,23 @@ class TestAccountUploadAvatar(WagtailTestUtils, TestCase, TestAccountSectionUtil
         self.avatar = get_test_image_file()
         self.other_avatar = get_test_image_file()
 
+    def create_image_file(self, size=(800, 800), color="red", name="test.png"):
+        img = Image.new("RGB", size, color=color)
+        img_byte_arr = io.BytesIO()
+
+        ext = name.split(".")[-1].upper()
+        if ext == "JPG":
+            ext = "JPEG"
+
+        img.save(img_byte_arr, format=ext)
+        img_byte_arr.seek(0)
+
+        content_type = f"image/{ext.lower()}" if ext != "JPEG" else "image/jpeg"
+
+        return SimpleUploadedFile(
+            name=name, content=img_byte_arr.read(), content_type=content_type
+        )
+
     def test_account_view(self):
         """
         This tests that the account view renders a "Upload a profile picture" field
@@ -789,6 +809,7 @@ class TestAccountUploadAvatar(WagtailTestUtils, TestCase, TestAccountSectionUtil
         """
         profile = UserProfile.get_for_user(self.user)
         profile.avatar = self.avatar
+        old_url = profile.avatar.url
         profile.save()
 
         # Upload a new avatar
@@ -798,7 +819,8 @@ class TestAccountUploadAvatar(WagtailTestUtils, TestCase, TestAccountSectionUtil
 
         # Check the avatar was changed
         profile.refresh_from_db()
-        self.assertIn("test.png", profile.avatar.url)
+        self.assertEqual("/media/test.png", old_url)
+        self.assertTrue(profile.avatar.url.endswith(".png"))
 
     def test_clear_removes_current_avatar(self):
         """
@@ -815,7 +837,71 @@ class TestAccountUploadAvatar(WagtailTestUtils, TestCase, TestAccountSectionUtil
 
         # Check the avatar was changed
         profile.refresh_from_db()
-        self.assertIn("test.png", profile.avatar.url)
+        self.assertTrue(profile.avatar)
+
+    def test_avatar_resize_large_image(self):
+        """Ensure that large uploaded images are resized to a maximum of 400x400."""
+        uploaded_file = self.create_image_file(size=(800, 800), name="large_image.jpg")
+        form = AvatarPreferencesForm(files={"avatar": uploaded_file})
+        self.assertTrue(form.is_valid())
+
+        avatar_file = form.clean_avatar()
+        resized_image = Image.open(avatar_file)
+        self.assertLessEqual(resized_image.width, 400)
+        self.assertLessEqual(resized_image.height, 400)
+
+    def test_avatar_no_resize_small_image(self):
+        uploaded_file = self.create_image_file(size=(300, 300), name="small_image.jpg")
+        form = AvatarPreferencesForm(files={"avatar": uploaded_file})
+        self.assertTrue(form.is_valid())
+
+        avatar_file = form.clean_avatar()
+        image = Image.open(avatar_file)
+        self.assertEqual(image.size, (300, 300))
+
+    def test_avatar_resize_width_greater_than_height(self):
+        uploaded_file = self.create_image_file(size=(500, 300), name="wide_image.jpg")
+        form = AvatarPreferencesForm(files={"avatar": uploaded_file})
+        self.assertTrue(form.is_valid())
+
+        avatar_file = form.clean_avatar()
+        resized_image = Image.open(avatar_file)
+        self.assertEqual(resized_image.size, (400, 240))
+
+        original_ratio = 500 / 300
+        new_ratio = resized_image.width / resized_image.height
+        self.assertAlmostEqual(original_ratio, new_ratio, places=2)
+
+    def test_avatar_resize_height_greater_than_width(self):
+        uploaded_file = self.create_image_file(size=(300, 500), name="tall_image.jpg")
+        form = AvatarPreferencesForm(files={"avatar": uploaded_file})
+        self.assertTrue(form.is_valid())
+
+        avatar_file = form.clean_avatar()
+        resized_image = Image.open(avatar_file)
+        self.assertEqual(resized_image.size, (240, 400))
+
+        original_ratio = 300 / 500
+        new_ratio = resized_image.width / resized_image.height
+        self.assertAlmostEqual(original_ratio, new_ratio, places=2)
+
+    def test_avatar_preserves_original_format(self):
+        # Test JPG format
+        jpg_file = self.create_image_file(size=(500, 500), name="test.jpg")
+        form = AvatarPreferencesForm(files={"avatar": jpg_file})
+        self.assertTrue(form.is_valid())
+        avatar_file = form.clean_avatar()
+        self.assertTrue(avatar_file.name.endswith(".jpg"))
+
+        # Test PNG format
+        png_file = self.create_image_file(size=(500, 500), name="test.png")
+        form = AvatarPreferencesForm(files={"avatar": png_file})
+        self.assertTrue(form.is_valid())
+        avatar_file = form.clean_avatar()
+        self.assertTrue(avatar_file.name.endswith(".png"))
+
+        resized_image = Image.open(avatar_file)
+        self.assertIsNotNone(resized_image.format)
 
 
 class TestAccountManagementForNonModerator(WagtailTestUtils, TestCase):

wagtail/admin/tests/test_collections_views.py

@@ -55,7 +55,7 @@ class TestCollectionsIndexViewAsSuperuser(
     def setUp(self):
         self.login()
 
-    def get(self, params={}):
+    def get(self, params=None):
         return self.client.get(reverse("wagtailadmin_collections:index"), params)
 
     def test_simple(self):
@@ -118,7 +118,7 @@ class TestCollectionsIndexView(CollectionInstanceTestUtils, WagtailTestUtils, Te
         super().setUp()
         self.login(self.marketing_user, password="password")
 
-    def get(self, params={}):
+    def get(self, params=None):
         return self.client.get(reverse("wagtailadmin_collections:index"), params)
 
     def test_marketing_user_no_permissions(self):
@@ -203,10 +203,10 @@ class TestAddCollectionAsSuperuser(AdminTemplateTestUtils, WagtailTestUtils, Tes
         self.login()
         self.root_collection = Collection.get_first_root_node()
 
-    def get(self, params={}):
+    def get(self, params=None):
         return self.client.get(reverse("wagtailadmin_collections:add"), params)
 
-    def post(self, post_data={}):
+    def post(self, post_data=None):
         return self.client.post(reverse("wagtailadmin_collections:add"), post_data)
 
     def test_get(self):
@@ -245,10 +245,10 @@ class TestAddCollection(CollectionInstanceTestUtils, WagtailTestUtils, TestCase)
         super().setUp()
         self.login(self.marketing_user, password="password")
 
-    def get(self, params={}):
+    def get(self, params=None):
         return self.client.get(reverse("wagtailadmin_collections:add"), params)
 
-    def post(self, post_data={}):
+    def post(self, post_data=None):
         return self.client.post(reverse("wagtailadmin_collections:add"), post_data)
 
     def test_marketing_user_no_permissions(self):
@@ -316,7 +316,7 @@ class TestEditCollectionAsSuperuser(AdminTemplateTestUtils, WagtailTestUtils, Te
         self.l2 = self.l1.add_child(name="Level 2")
         self.l3 = self.l2.add_child(name="Level 3")
 
-    def get(self, params={}, collection_id=None):
+    def get(self, params=None, collection_id=None):
         return self.client.get(
             reverse(
                 "wagtailadmin_collections:edit",
@@ -325,7 +325,7 @@ class TestEditCollectionAsSuperuser(AdminTemplateTestUtils, WagtailTestUtils, Te
             params,
         )
 
-    def post(self, post_data={}, collection_id=None):
+    def post(self, post_data=None, collection_id=None):
         return self.client.post(
             reverse(
                 "wagtailadmin_collections:edit",
@@ -408,12 +408,12 @@ class TestEditCollection(CollectionInstanceTestUtils, WagtailTestUtils, TestCase
         )
         self.login(self.marketing_user, password="password")
 
-    def get(self, collection_id, params={}):
+    def get(self, collection_id, params=None):
         return self.client.get(
             reverse("wagtailadmin_collections:edit", args=(collection_id,)), params
         )
 
-    def post(self, collection_id, post_data={}):
+    def post(self, collection_id, post_data=None):
         return self.client.post(
             reverse("wagtailadmin_collections:edit", args=(collection_id,)), post_data
         )
@@ -598,7 +598,7 @@ class TestDeleteCollectionAsSuperuser(
         self.root_collection = Collection.get_first_root_node()
         self.collection = self.root_collection.add_child(name="Holiday snaps")
 
-    def get(self, params={}, collection_id=None):
+    def get(self, params=None, collection_id=None):
         return self.client.get(
             reverse(
                 "wagtailadmin_collections:delete",
@@ -607,7 +607,7 @@ class TestDeleteCollectionAsSuperuser(
             params,
         )
 
-    def post(self, post_data={}, collection_id=None):
+    def post(self, post_data=None, collection_id=None):
         return self.client.post(
             reverse(
                 "wagtailadmin_collections:delete",
@@ -703,12 +703,12 @@ class TestDeleteCollection(CollectionInstanceTestUtils, WagtailTestUtils, TestCa
         )
         self.login(self.marketing_user, password="password")
 
-    def get(self, collection_id, params={}):
+    def get(self, collection_id, params=None):
         return self.client.get(
             reverse("wagtailadmin_collections:delete", args=(collection_id,)), params
         )
 
-    def post(self, collection_id, post_data={}):
+    def post(self, collection_id, post_data=None):
         return self.client.post(
             reverse("wagtailadmin_collections:delete", args=(collection_id,)), post_data
         )
@@ -775,7 +775,7 @@ class TestSetCollectionPrivacy(CollectionInstanceTestUtils, WagtailTestUtils, Te
         super().setUp()
         self.login()
 
-    def get(self, collection_id, params={}):
+    def get(self, collection_id, params=None):
         return self.client.get(
             reverse("wagtailadmin_collections:set_privacy", args=(collection_id,)),
             params,

wagtail/admin/tests/test_compare.py

@@ -921,6 +921,40 @@ class TestStreamFieldComparison(TestCase):
         self.assertTrue(comparison.has_changed())
 
 
+class TestStreamBlockComparison(TestCase):
+    comparison_class = compare.StreamBlockComparison
+
+    def test_streamblock_comparison_htmlvalue(self):
+        field = StreamPage._meta.get_field("body")
+        stream_block = field.stream_block.child_blocks["books"]
+
+        stream_value = StreamValue(
+            stream_block,
+            [
+                ("title", "Test Title", "1"),
+                ("author", "Test Author", "2"),
+            ],
+        )
+
+        comparison = self.comparison_class(
+            stream_block,
+            True,
+            True,
+            stream_value,
+            stream_value,
+        )
+
+        result = comparison.htmlvalue(stream_value)
+
+        self.assertIsInstance(result, SafeString)
+        self.assertIn("<dl>", result)
+        self.assertIn("</dl>", result)
+        self.assertIn("<dt>Title</dt>", result)
+        self.assertIn("<dt>Author</dt>", result)
+        self.assertIn("<dd>Test Title</dd>", result)
+        self.assertIn("<dd>Test Author</dd>", result)
+
+
 class TestChoiceFieldComparison(TestCase):
     comparison_class = compare.ChoiceFieldComparison