wagtail 7.0.1__py3-none-any.whl → 7.1__py3-none-any.whl

wagtail/admin/tests/pages/test_create_page.py

@@ -16,7 +16,7 @@ from wagtail.models import (
     PageViewRestriction,
     Revision,
 )
-from wagtail.signals import page_published
+from wagtail.signals import init_new_page, page_published
 from wagtail.test.testapp.models import (
     Advert,
     BusinessChild,
@@ -174,38 +174,48 @@ class TestPageCreation(WagtailTestUtils, TestCase):
         self.assertContains(response, 'href="%s?next=/admin/users/"' % target_url)
 
     def test_create_simplepage(self):
-        response = self.client.get(
-            reverse(
-                "wagtailadmin_pages:add",
-                args=("tests", "simplepage", self.root_page.id),
+        # Connect a mock signal handler to the signal
+        handler = mock.MagicMock()
+
+        init_new_page.connect(handler)
+        try:
+            response = self.client.get(
+                reverse(
+                    "wagtailadmin_pages:add",
+                    args=("tests", "simplepage", self.root_page.id),
+                )
             )
-        )
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(response["Content-Type"], "text/html; charset=utf-8")
-        self.assertContains(
-            response,
-            '<a id="tab-label-content" href="#tab-content" class="w-tabs__tab " role="tab" aria-selected="false" tabindex="-1">',
-        )
-        self.assertContains(
-            response,
-            '<a id="tab-label-promote" href="#tab-promote" class="w-tabs__tab " role="tab" aria-selected="false" tabindex="-1">',
-        )
-        # test register_page_action_menu_item hook
-        self.assertContains(
-            response,
-            '<button type="submit" name="action-panic" value="Panic!" class="button">Panic!</button>',
-        )
-        self.assertContains(response, "testapp/js/siren.js")
-        # test construct_page_action_menu hook
-        self.assertContains(
-            response,
-            '<button type="submit" name="action-relax" value="Relax." class="button">Relax.</button>',
-        )
-        # test that workflow actions are shown
-        self.assertContains(
-            response,
-            '<button type="submit" name="action-submit" value="Submit for moderation" class="button">',
-        )
+            self.assertEqual(response.status_code, 200)
+            self.assertEqual(response["Content-Type"], "text/html; charset=utf-8")
+            self.assertContains(
+                response,
+                '<a id="tab-label-content" href="#tab-content" class="w-tabs__tab " role="tab" aria-selected="false" tabindex="-1" data-action="w-tabs#select:prevent" data-w-tabs-target="trigger">',
+            )
+            self.assertContains(
+                response,
+                '<a id="tab-label-promote" href="#tab-promote" class="w-tabs__tab " role="tab" aria-selected="false" tabindex="-1" data-action="w-tabs#select:prevent" data-w-tabs-target="trigger">',
+            )
+            # test register_page_action_menu_item hook
+            self.assertContains(
+                response,
+                '<button type="submit" name="action-panic" value="Panic!" class="button">Panic!</button>',
+            )
+            self.assertContains(response, "testapp/js/siren.js")
+            # test construct_page_action_menu hook
+            self.assertContains(
+                response,
+                '<button type="submit" name="action-relax" value="Relax." class="button">Relax.</button>',
+            )
+            # test that workflow actions are shown
+            self.assertContains(
+                response,
+                '<button type="submit" name="action-submit" value="Submit for moderation" class="button">',
+            )
+
+            self.assertEqual(handler.call_count, 1)
+        finally:
+            # Disconnect mock handler to prevent cross-test pollution
+            init_new_page.disconnect(handler)
 
     @override_settings(WAGTAIL_WORKFLOW_ENABLED=False)
     def test_workflow_buttons_not_shown_when_workflow_disabled(self):
@@ -255,7 +265,7 @@ class TestPageCreation(WagtailTestUtils, TestCase):
         self.assertEqual(response.status_code, 200)
         self.assertContains(
             response,
-            '<a id="tab-label-content" href="#tab-content" class="w-tabs__tab " role="tab" aria-selected="false" tabindex="-1">',
+            '<a id="tab-label-content" href="#tab-content" class="w-tabs__tab " role="tab" aria-selected="false" tabindex="-1" data-action="w-tabs#select:prevent" data-w-tabs-target="trigger">',
         )
         self.assertNotContains(response, "tab-promote")
 
@@ -272,15 +282,15 @@ class TestPageCreation(WagtailTestUtils, TestCase):
         self.assertEqual(response.status_code, 200)
         self.assertContains(
             response,
-            '<a id="tab-label-content" href="#tab-content" class="w-tabs__tab " role="tab" aria-selected="false" tabindex="-1">',
+            '<a id="tab-label-content" href="#tab-content" class="w-tabs__tab " role="tab" aria-selected="false" tabindex="-1" data-action="w-tabs#select:prevent" data-w-tabs-target="trigger">',
         )
         self.assertContains(
             response,
-            '<a id="tab-label-promote" href="#tab-promote" class="w-tabs__tab " role="tab" aria-selected="false" tabindex="-1">',
+            '<a id="tab-label-promote" href="#tab-promote" class="w-tabs__tab " role="tab" aria-selected="false" tabindex="-1" data-action="w-tabs#select:prevent" data-w-tabs-target="trigger">',
         )
         self.assertContains(
             response,
-            '<a id="tab-label-dinosaurs" href="#tab-dinosaurs" class="w-tabs__tab " role="tab" aria-selected="false" tabindex="-1">',
+            '<a id="tab-label-dinosaurs" href="#tab-dinosaurs" class="w-tabs__tab " role="tab" aria-selected="false" tabindex="-1" data-action="w-tabs#select:prevent" data-w-tabs-target="trigger">',
         )
 
     def test_create_page_with_non_model_field(self):
@@ -307,31 +317,49 @@ class TestPageCreation(WagtailTestUtils, TestCase):
         )
         self.user.save()
 
-        # Get page
-        response = self.client.get(
-            reverse(
-                "wagtailadmin_pages:add",
-                args=(
-                    "tests",
-                    "simplepage",
-                    self.root_page.id,
-                ),
+        handler = mock.MagicMock()
+
+        init_new_page.connect(handler)
+        try:
+            # Get page
+            response = self.client.get(
+                reverse(
+                    "wagtailadmin_pages:add",
+                    args=(
+                        "tests",
+                        "simplepage",
+                        self.root_page.id,
+                    ),
+                )
             )
-        )
 
-        # Check that the user received a 403 response
-        self.assertEqual(response.status_code, 302)
+            # Check that the user received a 403 response
+            self.assertEqual(response.status_code, 302)
+
+            self.assertEqual(handler.call_count, 0)
+        finally:
+            # Disconnect mock handler to prevent cross-test pollution
+            init_new_page.disconnect(handler)
 
     def test_cannot_create_page_with_is_creatable_false(self):
         # tests.MTIBasePage has is_creatable=False, so attempting to add a new one
         # should fail with permission denied
-        response = self.client.get(
-            reverse(
-                "wagtailadmin_pages:add",
-                args=("tests", "mtibasepage", self.root_page.id),
+        handler = mock.MagicMock()
+
+        init_new_page.connect(handler)
+        try:
+            response = self.client.get(
+                reverse(
+                    "wagtailadmin_pages:add",
+                    args=("tests", "mtibasepage", self.root_page.id),
+                )
             )
-        )
-        self.assertRedirects(response, "/admin/")
+            self.assertRedirects(response, "/admin/")
+
+            # Check that the signal was not fired
+            self.assertEqual(handler.call_count, 0)
+        finally:
+            init_new_page.disconnect(handler)
 
     def test_cannot_create_page_when_can_create_at_returns_false(self):
         # issue #2892
@@ -403,13 +431,22 @@ class TestPageCreation(WagtailTestUtils, TestCase):
     def test_cannot_create_page_with_wrong_parent_page_types(self):
         # tests.BusinessChild has limited parent_page_types, so attempting to add
         # a new one at the root level should fail with permission denied
-        response = self.client.get(
-            reverse(
-                "wagtailadmin_pages:add",
-                args=("tests", "businesschild", self.root_page.id),
+        handler = mock.MagicMock()
+
+        init_new_page.connect(handler)
+        try:
+            response = self.client.get(
+                reverse(
+                    "wagtailadmin_pages:add",
+                    args=("tests", "businesschild", self.root_page.id),
+                )
             )
-        )
-        self.assertRedirects(response, "/admin/")
+            self.assertRedirects(response, "/admin/")
+
+            # Check that the signal was not fired
+            self.assertEqual(handler.call_count, 0)
+        finally:
+            init_new_page.disconnect(handler)
 
     def test_cannot_create_page_with_wrong_subpage_types(self):
         # Add a BusinessIndex to test business rules in
@@ -421,13 +458,22 @@ class TestPageCreation(WagtailTestUtils, TestCase):
 
         # BusinessIndex has limited subpage_types, so attempting to add a SimplePage
         # underneath it should fail with permission denied
-        response = self.client.get(
-            reverse(
-                "wagtailadmin_pages:add",
-                args=("tests", "simplepage", business_index.id),
+        handler = mock.MagicMock()
+
+        init_new_page.connect(handler)
+        try:
+            response = self.client.get(
+                reverse(
+                    "wagtailadmin_pages:add",
+                    args=("tests", "simplepage", business_index.id),
+                )
             )
-        )
-        self.assertRedirects(response, "/admin/")
+            self.assertRedirects(response, "/admin/")
+
+            self.assertEqual(handler.call_count, 0)
+        finally:
+            # Disconnect mock handler to prevent cross-test pollution
+            init_new_page.disconnect(handler)
 
     def test_create_page_defined_before_admin_load(self):
         """

wagtail/admin/tests/pages/test_delete_page.py

@@ -8,7 +8,12 @@ from django.urls import reverse
 
 from wagtail.models import Page
 from wagtail.signals import page_unpublished
-from wagtail.test.testapp.models import SimplePage, StandardChild, StandardIndex
+from wagtail.test.testapp.models import (
+    SimplePage,
+    StandardChild,
+    StandardIndex,
+    VariousOnDeleteModel,
+)
 from wagtail.test.utils import WagtailTestUtils
 
 
@@ -78,7 +83,9 @@ class TestPageDelete(WagtailTestUtils, TestCase):
             reverse("wagtailadmin_pages:delete", args=(self.child_page.id,))
         )
         self.assertEqual(response.status_code, 200)
-        self.assertContains(response, "This action will delete total <b>3</b> pages.")
+        self.assertContains(
+            response, "This action will delete <b>3</b> pages in total."
+        )
         self.assertContains(response, "Please type <b>mysite</b> to confirm.")
         self.assertContains(response, '<input type="text" name="confirm_site_name"')
         # deletion should not actually happen on GET
@@ -102,7 +109,9 @@ class TestPageDelete(WagtailTestUtils, TestCase):
         # One error messages should be returned
         messages = [m.message for m in response.context["messages"]]
         self.assertEqual(len(messages), 1)
-        self.assertContains(response, "This action will delete total <b>3</b> pages.")
+        self.assertContains(
+            response, "This action will delete <b>3</b> pages in total."
+        )
         self.assertContains(response, "Please type <b>mysite</b> to confirm.")
         self.assertContains(response, '<input type="text" name="confirm_site_name"')
         # Site should not be deleted
@@ -364,3 +373,24 @@ class TestPageDelete(WagtailTestUtils, TestCase):
 
         # page should be deleted
         self.assertFalse(Page.objects.filter(id=self.child_page.id).exists())
+
+    def test_delete_post_with_protected_reference(self):
+        with self.captureOnCommitCallbacks(execute=True):
+            VariousOnDeleteModel.objects.create(
+                text="Undeletable",
+                protected_page=self.child_page,
+            )
+        response = self.client.post(
+            reverse("wagtailadmin_pages:delete", args=(self.child_page.id,))
+        )
+
+        # Should throw a PermissionDenied error and redirect to the dashboard
+        self.assertEqual(response.status_code, 302)
+        self.assertRedirects(response, reverse("wagtailadmin_home"))
+        self.assertEqual(
+            response.context["message"],
+            "Sorry, you do not have permission to access this area.",
+        )
+
+        # Check that the page is still here
+        self.assertTrue(Page.objects.filter(pk=self.child_page.id).exists())

wagtail/admin/tests/pages/test_edit_page.py

@@ -1925,8 +1925,8 @@ class TestPageEdit(WagtailTestUtils, TestCase):
             reverse("wagtailadmin_pages:edit", args=(self.child_page.id,))
         )
 
-        input_field_for_draft_slug = '<input type="text" name="slug" value="revised-slug-in-draft-only" data-controller="w-slug" data-action="blur-&gt;w-slug#slugify w-sync:check-&gt;w-slug#compare w-sync:apply-&gt;w-slug#urlify:prevent" data-w-slug-compare-as-param="urlify" data-w-slug-allow-unicode-value maxlength="255" aria-describedby="panel-child-promote-child-for_search_engines-child-slug-helptext" required id="id_slug">'
-        input_field_for_live_slug = '<input type="text" name="slug" value="hello-world" data-controller="w-slug" data-action="blur-&gt;w-slug#slugify w-sync:check-&gt;w-slug#compare w-sync:apply-&gt;w-slug#urlify:prevent" data-w-slug-compare-as-param="urlify" data-w-slug-allow-unicode-value maxlength="255" aria-describedby="panel-child-promote-child-for_search_engines-child-slug-helptext" required id="id_slug" />'
+        input_field_for_draft_slug = '<input type="text" name="slug" value="revised-slug-in-draft-only" data-controller="w-slug" data-action="blur-&gt;w-slug#slugify w-sync:check-&gt;w-slug#compare w-sync:apply-&gt;w-slug#urlify:prevent" data-w-slug-compare-as-param="urlify" data-w-slug-allow-unicode-value data-w-slug-trim-value="true" maxlength="255" aria-describedby="panel-child-promote-child-for_search_engines-child-slug-helptext" required id="id_slug">'
+        input_field_for_live_slug = '<input type="text" name="slug" value="hello-world" data-controller="w-slug" data-action="blur-&gt;w-slug#slugify w-sync:check-&gt;w-slug#compare w-sync:apply-&gt;w-slug#urlify:prevent" data-w-slug-compare-as-param="urlify" data-w-slug-allow-unicode-value data-w-slug-trim-value="true" maxlength="255" aria-describedby="panel-child-promote-child-for_search_engines-child-slug-helptext" required id="id_slug" />'
 
         # Status Link should be the live page (not revision)
         self.assertNotContains(
@@ -1951,8 +1951,8 @@ class TestPageEdit(WagtailTestUtils, TestCase):
             reverse("wagtailadmin_pages:edit", args=(self.single_event_page.id,))
         )
 
-        input_field_for_draft_slug = '<input type="text" name="slug" value="revised-slug-in-draft-only" data-controller="w-slug" data-action="blur-&gt;w-slug#slugify w-sync:check-&gt;w-slug#compare w-sync:apply-&gt;w-slug#urlify:prevent" data-w-slug-compare-as-param="urlify" data-w-slug-allow-unicode-value maxlength="255" aria-describedby="panel-child-promote-child-common_page_configuration-child-slug-helptext" required id="id_slug" />'
-        input_field_for_live_slug = '<input type="text" name="slug" value="mars-landing" data-controller="w-slug" data-action="blur-&gt;w-slug#slugify w-sync:check-&gt;w-slug#compare w-sync:apply-&gt;w-slug#urlify:prevent" data-w-slug-compare-as-param="urlify" data-w-slug-allow-unicode-value maxlength="255" aria-describedby="panel-child-promote-child-common_page_configuration-child-slug-helptext" required id="id_slug" />'
+        input_field_for_draft_slug = '<input type="text" name="slug" value="revised-slug-in-draft-only" data-controller="w-slug" data-action="blur-&gt;w-slug#slugify w-sync:check-&gt;w-slug#compare w-sync:apply-&gt;w-slug#urlify:prevent" data-w-slug-compare-as-param="urlify" data-w-slug-allow-unicode-value data-w-slug-trim-value="true" maxlength="255" aria-describedby="panel-child-promote-child-common_page_configuration-child-slug-helptext" required id="id_slug" />'
+        input_field_for_live_slug = '<input type="text" name="slug" value="mars-landing" data-controller="w-slug" data-action="blur-&gt;w-slug#slugify w-sync:check-&gt;w-slug#compare w-sync:apply-&gt;w-slug#urlify:prevent" data-w-slug-compare-as-param="urlify" data-w-slug-allow-unicode-value data-w-slug-trim-value="true" maxlength="255" aria-describedby="panel-child-promote-child-common_page_configuration-child-slug-helptext" required id="id_slug" />'
 
         # Status Link should be the live page (not revision)
         self.assertNotContains(
@@ -2139,6 +2139,31 @@ class TestPageEdit(WagtailTestUtils, TestCase):
             html=True,
         )
 
+    def test_edit_alias_page_from_draft_page(self):
+        # Ensure we have at least one revision. This is what happens when creating
+        # a page via the admin. It is stored as latest_revision
+        self.unpublished_page.save_revision()
+        alias_page = self.unpublished_page.create_alias(update_slug="an-alias-page")
+        response = self.client.get(
+            reverse("wagtailadmin_pages:edit", args=[alias_page.id])
+        )
+
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response["Content-Type"], "text/html; charset=utf-8")
+
+        self.assertNotContains(response, 'id="status-sidebar-live"')
+
+        # Check the edit_alias.html template was used instead
+        self.assertTemplateUsed(response, "wagtailadmin/pages/edit_alias.html")
+        original_page_edit_url = reverse(
+            "wagtailadmin_pages:edit", args=[self.unpublished_page.id]
+        )
+        self.assertContains(
+            response,
+            f'<a class="button button-secondary" href="{original_page_edit_url}">Edit original page</a>',
+            html=True,
+        )
+
     def test_post_edit_alias_page(self):
         alias_page = self.child_page.create_alias(update_slug="new-child-page")
 
@@ -2223,7 +2248,7 @@ class TestPageEdit(WagtailTestUtils, TestCase):
         # as when running it within the full test suite
         self.client.get(reverse("wagtailadmin_pages:edit", args=(self.event_page.id,)))
 
-        with self.assertNumQueries(35):
+        with self.assertNumQueries(36):
             self.client.get(
                 reverse("wagtailadmin_pages:edit", args=(self.event_page.id,))
             )
@@ -2236,7 +2261,7 @@ class TestPageEdit(WagtailTestUtils, TestCase):
         # Warm up the cache as above.
         self.client.get(reverse("wagtailadmin_pages:edit", args=(self.event_page.id,)))
 
-        with self.assertNumQueries(39):
+        with self.assertNumQueries(41):
             self.client.get(
                 reverse("wagtailadmin_pages:edit", args=(self.event_page.id,))
             )
@@ -2436,6 +2461,8 @@ class TestChildRelationsOnSuperclass(WagtailTestUtils, TestCase):
         # Response should include an advert_placements formset labelled Adverts
         self.assertContains(response, "Adverts")
         self.assertContains(response, "id_advert_placements-TOTAL_FORMS")
+        # Expecting the add-button
+        self.assertContains(response, "Add advert")
 
     def test_post_create_form(self):
         post_data = {
@@ -2514,6 +2541,8 @@ class TestChildRelationsOnSuperclass(WagtailTestUtils, TestCase):
             '<input type="hidden" name="advert_placements-0-advert" value="1" id="id_advert_placements-0-advert">',
             html=True,
         )
+        # Expecting the add-button
+        self.assertContains(response, "Add advert")
 
     def test_post_edit_form(self):
         post_data = {

wagtail/admin/tests/pages/test_workflow_history.py

@@ -164,10 +164,11 @@ class TestWorkflowHistoryDetail(AdminTemplateTestUtils, WagtailTestUtils, TestCa
             ),
         )
 
-        self.assertContains(response, '<div class="w-tabs" data-tabs>')
-        self.assertContains(response, '<div class="tab-content">')
-
         soup = self.get_soup(response.content)
+
+        self.assertIsNotNone(soup.select_one('[data-controller~="w-tabs"]'))
+        self.assertIsNotNone(soup.select_one(".tab-content"))
+
         tasks = soup.select_one("#tab-tasks table")
         self.assertIsNotNone(tasks)
         cells = [
@@ -296,10 +297,11 @@ class TestWorkflowHistoryDetail(AdminTemplateTestUtils, WagtailTestUtils, TestCa
             ),
         )
 
-        self.assertContains(response, '<div class="w-tabs" data-tabs>')
-        self.assertContains(response, '<div class="tab-content">')
-
         soup = self.get_soup(response.content)
+
+        self.assertIsNotNone(soup.select_one('[data-controller~="w-tabs"]'))
+        self.assertIsNotNone(soup.select_one(".tab-content"))
+
         tasks = soup.select_one("#tab-tasks table")
         self.assertIsNotNone(tasks)
         cells = [

wagtail/admin/tests/test_account_management.py

@@ -121,6 +121,25 @@ class TestAuthentication(WagtailTestUtils, TestCase):
         # Check that the user was logged out
         self.assertNotIn("_auth_user_id", self.client.session)
 
+    @override_settings(WAGTAILADMIN_LOGIN_URL="fallback")
+    def test_logout_redirect_with_custom_login_url(self):
+        """
+        This tests that if the WAGTAILADMIN_LOGIN_URL setting is customized,
+        the user will be redirected to that URL when logging out of the admin.
+        """
+        # Login
+        self.login()
+
+        # Get logout page
+        response = self.client.post(reverse("wagtailadmin_logout"))
+
+        # Check that the user was redirected to the URL set for the
+        # WAGTAILADMIN_LOGIN_URL setting
+        self.assertRedirects(response, reverse("fallback"))
+
+        # Check that the user was logged out
+        self.assertNotIn("_auth_user_id", self.client.session)
+
     def test_not_logged_in_redirect(self):
         """
         This tests that a not logged in user is redirected to the
@@ -234,6 +253,7 @@ class TestAccountSectionUtilsMixin:
             "theme-theme": "dark",
             "theme-density": "default",
             "theme-contrast": "system",
+            "keyboard-shortcuts": "true",
         }
         post_data.update(extra_post_data)
         return self.client.post(reverse("wagtailadmin_account"), post_data)
@@ -689,6 +709,23 @@ class TestAccountSection(
         self.assertTrue(hasattr(request, "sensitive_post_parameters"))
         self.assertEqual(request.sensitive_post_parameters, "__ALL__")
 
+    def test_change_keyboard_shortcut_preference(self):
+        response = self.post_form(
+            {
+                "keyboard_shortcuts": "false",
+            }
+        )
+
+        # Check that the user was redirected to the account page
+        self.assertRedirects(response, reverse("wagtailadmin_account"))
+
+        profile = UserProfile.get_for_user(
+            get_user_model().objects.get(pk=self.user.pk)
+        )
+
+        # Check that the keyboard shortcut preferences are as submitted
+        self.assertFalse(profile.keyboard_shortcuts)
+
 
 class TestAccountUploadAvatar(WagtailTestUtils, TestCase, TestAccountSectionUtilsMixin):
     def setUp(self):

wagtail/admin/tests/test_audit_log.py

@@ -480,12 +480,12 @@ class TestAuditLogAdmin(AdminTemplateTestUtils, WagtailTestUtils, TestCase):
         self.client.get(history_url)
 
         # Initial load, without any log entries
-        with self.assertNumQueries(17):
+        with self.assertNumQueries(18):
             self.client.get(history_url)
 
         # With some log entries
         self._update_page(self.hello_page)
-        with self.assertNumQueries(19):
+        with self.assertNumQueries(20):
             self.client.get(history_url)
 
         # With even more log entries, should remain the same (no N+1 queries)
@@ -517,5 +517,5 @@ class TestAuditLogAdmin(AdminTemplateTestUtils, WagtailTestUtils, TestCase):
             },
         )
         self._update_page(self.hello_page)
-        with self.assertNumQueries(19):
+        with self.assertNumQueries(20):
             self.client.get(history_url)

wagtail/admin/tests/test_block_preview.py

@@ -3,6 +3,7 @@ from django.http import HttpRequest
 from django.test import TestCase
 from django.urls import reverse
 from django.utils.http import urlencode
+from django.utils.translation import gettext_lazy as _
 
 from wagtail import blocks
 from wagtail.test.utils import WagtailTestUtils
@@ -96,13 +97,22 @@ class TestStreamFieldBlockPreviewView(WagtailTestUtils, TestCase):
         self.assertEqual(main.text.strip(), "None")
 
     def test_preview_value_falls_back_to_default(self):
-        block = blocks.IntegerBlock(default=42)
-        response = self.get(block)
-        self.assertEqual(response.status_code, 200)
-        soup = self.get_soup(response.content)
-        main = soup.select_one("main")
-        self.assertIsNotNone(main)
-        self.assertEqual(main.text.strip(), "42")
+        def callable_default():
+            return 42
+
+        cases = [
+            ("static", blocks.IntegerBlock(default=42)),
+            ("callable", blocks.IntegerBlock(default=callable_default)),
+        ]
+
+        for via, block in cases:
+            with self.subTest(via=via):
+                response = self.get(block)
+                self.assertEqual(response.status_code, 200)
+                soup = self.get_soup(response.content)
+                main = soup.select_one("main")
+                self.assertIsNotNone(main)
+                self.assertEqual(main.text.strip(), "42")
 
     def test_preview_template(self):
         class PreviewTemplateViaMeta(blocks.Block):
@@ -142,6 +152,10 @@ class TestStreamFieldBlockPreviewView(WagtailTestUtils, TestCase):
                 self.assertEqual(custom_js["src"], "/static/js/custom.js")
 
     def test_preview_value(self):
+        @staticmethod
+        def preview_callable():
+            return "Hello, world!"
+
         class PreviewValueViaMeta(blocks.Block):
             class Meta:
                 preview_value = "Hello, world!"
@@ -150,10 +164,20 @@ class TestStreamFieldBlockPreviewView(WagtailTestUtils, TestCase):
             def get_preview_value(self):
                 return "Hello, world!"
 
+        class PreviewValueViaCallableMeta(blocks.Block):
+            class Meta:
+                preview_value = preview_callable
+
         cases = [
             ("meta", PreviewValueViaMeta()),
             ("method", PreviewValueViaMethod()),
+            ("meta_callable", PreviewValueViaCallableMeta()),
             ("kwarg", blocks.Block(preview_value="Hello, world!")),
+            ("localized", blocks.Block(preview_value=_("Hello, world!"))),
+            (
+                "localized_rich_text",
+                blocks.RichTextBlock(preview_value=_("<p>Hello, world!</p>")),
+            ),
         ]
 
         for via, block in cases: