wagtail 7.1.1__py3-none-any.whl → 7.2rc1__py3-none-any.whl

wagtail/admin/tests/test_keyboard_shortcuts.py

@@ -7,6 +7,7 @@ from django.urls import reverse
 
 from wagtail.admin.utils import get_keyboard_key_labels_from_request
 from wagtail.test.utils import WagtailTestUtils
+from wagtail.users.models import UserProfile
 
 
 class TestGetKeyboardKeyLabelsFromRequestUtil(TestCase):
@@ -65,7 +66,8 @@ class TestGetKeyboardKeyLabelsFromRequestUtil(TestCase):
 
 class TestKeyboardShortcutsDialog(WagtailTestUtils, TestCase):
     def setUp(self):
-        self.login()
+        self.test_user = self.create_test_user()
+        self.login(user=self.test_user)
 
     def test_keyboard_shortcuts_trigger_in_sidebar(self):
         response = self.client.get(reverse("wagtailadmin_home"))
@@ -83,7 +85,8 @@ class TestKeyboardShortcutsDialog(WagtailTestUtils, TestCase):
                     "role": "button",
                     "data-a11y-dialog-show": "keyboard-shortcuts-dialog",
                     "data-action": "w-action#noop:prevent:stop",
-                    "data-controller": "w-action",
+                    "data-controller": "w-kbd w-action",
+                    "data-w-kbd-key-value": "?",
                 }
             ),
             sidebar_data,
@@ -151,6 +154,53 @@ class TestKeyboardShortcutsDialog(WagtailTestUtils, TestCase):
         self.assertNotIn("comments", shortcuts_dialog.prettify())
         self.assertNotIn("Ctrl + Alt + m", all_shortcuts_text)
 
+    def test_account_link_in_modal(self):
+        """
+        Test that the 'account' link fragment is correctly rendered in the
+        keyboard shortcuts modal.
+        """
+        response = self.client.get(reverse("wagtailadmin_home"))
+        self.assertEqual(response.status_code, 200)
+
+        soup = self.get_soup(response.content)
+        shortcuts_dialog = soup.select_one("#keyboard-shortcuts-dialog")
+        self.assertIsNotNone(shortcuts_dialog)
+
+        account_link = shortcuts_dialog.select_one("a[href$='account/']")
+        self.assertIsNotNone(account_link)
+        self.assertEqual(account_link.text.strip(), "account")
+        self.assertIn("w-underline", account_link.get("class", []))
+
+    def test_modal_shows_disabled_info_when_keyboard_shortcuts_disabled(self):
+        """
+        Modal should open and show warning if keyboard shortcuts are disabled.
+        """
+        profile = UserProfile.get_for_user(self.test_user)
+        profile.keyboard_shortcuts = False
+        profile.save()
+
+        response = self.client.get(reverse("wagtailadmin_home"))
+
+        soup = self.get_soup(response.content)
+        shortcuts_dialog = soup.select_one("#keyboard-shortcuts-dialog")
+        self.assertIn(
+            "Keyboard shortcuts are currently disabled", shortcuts_dialog.prettify()
+        )
+
+    def test_modal_shows_enabled_info_when_shortcuts_enabled(self):
+        """
+        Modal should show normal info when keyboard shortcuts are enabled.
+        """
+        profile = UserProfile.get_for_user(self.test_user)
+        response = self.client.get(reverse("wagtailadmin_home"))
+        soup = self.get_soup(response.content)
+        shortcuts_dialog = soup.select_one("#keyboard-shortcuts-dialog")
+
+        self.assertTrue(profile.keyboard_shortcuts)
+        self.assertIn(
+            "Keyboard shortcuts are currently enabled", shortcuts_dialog.prettify()
+        )
+
 
 class TestMacKeyboardShortcutsDialog(WagtailTestUtils, TestCase):
     def setUp(self):

wagtail/admin/tests/test_menu.py

@@ -411,11 +411,9 @@ class TestMenuRendering(WagtailTestUtils, TestCase):
             "important-pages-generic-setting",
             "redirects",
             "important-pages-site-setting",
-            "workflow-tasks",
             "promoted-search-results",
             "icon-generic-setting",
             "file-site-setting",
-            "workflows",
             "file-generic-setting",
         }
 

wagtail/admin/tests/test_privacy.py

@@ -69,14 +69,14 @@ class TestSetPrivacyView(WagtailTestUtils, TestCase):
         """
         This tests that a blank form is returned when a user opens the set_privacy view on a public page
         """
-        response = self.client.get(
-            reverse("wagtailadmin_pages:set_privacy", args=(self.public_page.id,))
-        )
+        url = reverse("wagtailadmin_pages:set_privacy", args=(self.public_page.id,))
+        response = self.client.get(url)
 
         # Check response
         self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed(response, "wagtailadmin/page_privacy/set_privacy.html")
-        self.assertEqual(response.context["page"].specific, self.public_page)
+        self.assertTemplateUsed(response, "wagtailadmin/shared/set_privacy.html")
+        self.assertEqual(response.context["object"].specific, self.public_page)
+        self.assertEqual(response.context["action_url"], url)
 
         # Check form attributes
         self.assertEqual(response.context["form"]["restriction_type"].value(), "none")
@@ -86,14 +86,14 @@ class TestSetPrivacyView(WagtailTestUtils, TestCase):
         This tests that the restriction type and password fields as set correctly
         when a user opens the set_privacy view on a public page
         """
-        response = self.client.get(
-            reverse("wagtailadmin_pages:set_privacy", args=(self.private_page.id,))
-        )
+        url = reverse("wagtailadmin_pages:set_privacy", args=(self.private_page.id,))
+        response = self.client.get(url)
 
         # Check response
         self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed(response, "wagtailadmin/page_privacy/set_privacy.html")
-        self.assertEqual(response.context["page"].specific, self.private_page)
+        self.assertTemplateUsed(response, "wagtailadmin/shared/set_privacy.html")
+        self.assertEqual(response.context["object"].specific, self.private_page)
+        self.assertEqual(response.context["action_url"], url)
 
         # Check form attributes
         self.assertEqual(
@@ -254,16 +254,16 @@ class TestSetPrivacyView(WagtailTestUtils, TestCase):
         """
         This tests that the restriction type and group fields as set correctly when a user opens the set_privacy view on a public page
         """
-        response = self.client.get(
-            reverse(
-                "wagtailadmin_pages:set_privacy", args=(self.private_groups_page.id,)
-            )
+        url = reverse(
+            "wagtailadmin_pages:set_privacy", args=(self.private_groups_page.id,)
         )
+        response = self.client.get(url)
 
         # Check response
         self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed(response, "wagtailadmin/page_privacy/set_privacy.html")
-        self.assertEqual(response.context["page"].specific, self.private_groups_page)
+        self.assertTemplateUsed(response, "wagtailadmin/shared/set_privacy.html")
+        self.assertEqual(response.context["object"].specific, self.private_groups_page)
+        self.assertEqual(response.context["action_url"], url)
 
         # Check form attributes
         self.assertEqual(response.context["form"]["restriction_type"].value(), "groups")

wagtail/admin/tests/test_templatetags.py

@@ -4,6 +4,7 @@ from datetime import datetime, timedelta
 from datetime import timezone as dt_timezone
 from unittest import mock
 
+from django import forms
 from django.conf import settings
 from django.template import Context, Template, TemplateSyntaxError
 from django.test import SimpleTestCase, TestCase
@@ -1084,3 +1085,139 @@ class ThemeColorSchemeTest(AdminTemplateTestUtils, WagtailTestUtils, TestCase):
         meta_tag = soup.find("meta", {"name": "color-scheme"})
         self.assertIsNotNone(meta_tag)
         self.assertEqual(meta_tag["content"], "light")
+
+
+class FormattedfieldTagTestCase(WagtailTestUtils, SimpleTestCase):
+    def render_template(self, template, field_name="title", **context):
+        class BasicForm(forms.Form):
+            title = forms.CharField()
+
+        form = BasicForm(data={})
+
+        html = Template("{% load wagtailadmin_tags %}" + template).render(
+            Context(
+                {
+                    "field": form[field_name],
+                    **context,
+                }
+            )
+        )
+
+        # Parse the rendered HTML for the first DOM element in the output
+        return self.get_soup(html).find()
+
+    def test_basic_usage_with_full_html(self):
+        soup = self.render_template("{% formattedfield field=field %}")
+
+        # check the outer wrapper attributes
+        self.assertEqual(
+            {"class": ["w-field__wrapper"], "data-field-wrapper": ""},
+            soup.attrs,
+        )
+
+        # check the label is correct
+        label = soup.find("label")
+        self.assertIsNotNone(label)
+        self.assertEqual(label["for"], "id_title")
+        self.assertEqual(label["id"], "id_title-label")
+        self.assertEqual(label.get_text().strip(), "Title*")
+
+        # check there is an error container
+        errors = soup.find("div", {"data-field-errors": ""})
+        self.assertIsNotNone(errors)
+        self.assertEqual(errors["class"], ["w-field__errors"])
+        self.assertEqual(errors.get_text().strip(), "This field is required.")
+
+        # check there is a help container that is empty
+        help_text = soup.find("div", {"data-field-help": ""})
+        self.assertIsNotNone(help_text)
+        self.assertEqual(help_text["class"], ["w-field__help"])
+        self.assertEqual(help_text.get_text().strip(), "")
+
+        # check there is an input
+        input = soup.find("input")
+        self.assertIsNotNone(input)
+        self.assertEqual(input["id"], "id_title")
+        self.assertEqual(input["name"], "title")
+        self.assertEqual(input["type"], "text")
+        self.assertEqual(input["required"], "")
+
+        # check the input container & input siblings
+        input_container = input.parent
+        self.assertIsNone(input.find("svg"))  # there should be no icon
+        self.assertEqual(
+            input_container.attrs, {"class": ["w-field__input"], "data-field-input": ""}
+        )  # validate input container
+
+    def test_complex_usage_with_full_html(self):
+        soup = self.render_template(
+            """{% formattedfield field=field wrapper_id="__CUSTOM_ID__" classname="extra-custom-class" sr_only_label=True icon='search' help_text='This is a help text.' show_add_comment_button=True %}"""
+        )
+
+        # check the outer wrapper attributes
+        self.assertEqual(
+            {
+                "class": ["w-field__wrapper", "extra-custom-class"],
+                "id": "__CUSTOM_ID__",
+                "data-field-wrapper": "",
+            },
+            soup.attrs,
+        )
+
+        # check the label is correct
+        label = soup.find("label")
+        self.assertIsNotNone(label)
+        self.assertEqual(label["for"], "id_title")
+        self.assertEqual(label["id"], "id_title-label")
+        self.assertEqual(label.get_text().strip(), "Title*")
+
+        # check there is an error container
+        errors = soup.find("div", {"data-field-errors": ""})
+        self.assertIsNotNone(errors)
+        self.assertEqual(errors["class"], ["w-field__errors"])
+        self.assertEqual(errors.get_text().strip(), "This field is required.")
+
+        # check there is a help container that is empty
+        help_text = soup.find("div", {"data-field-help": ""})
+        self.assertIsNotNone(help_text)
+        self.assertEqual(help_text["class"], ["w-field__help"])
+        self.assertEqual(help_text.get_text().strip(), "This is a help text.")
+
+        # check there is an input
+        input = soup.find("input")
+        self.assertIsNotNone(input)
+        self.assertEqual(input["id"], "id_title")
+        self.assertEqual(input["name"], "title")
+        self.assertEqual(input["type"], "text")
+        self.assertEqual(input["required"], "")
+
+        # check the input container & input siblings
+        input_container = input.parent
+        self.assertEqual(
+            input_container.find("svg").find("use")["href"], "#icon-search"
+        )  # there should be an icon
+        self.assertEqual(
+            input_container.attrs, {"class": ["w-field__input"], "data-field-input": ""}
+        )  # validate input container
+
+    def test_attrs_rendering(self):
+        soup = self.render_template(
+            """{% formattedfield field=field wrapper_id="__CUSTOM_ID__" classname="extra-custom-class" attrs=attrs %}""",
+            attrs={
+                "data-custom-attr": "custom-value",
+                "data-controller": "w-example w-other",
+                "data-field-wrapper": "__CANNOT_OVERRIDE_DEFAULT__",
+            },
+        )
+
+        self.assertEqual(
+            {
+                "class": ["w-field__wrapper", "extra-custom-class"],
+                "id": "__CUSTOM_ID__",
+                "data-custom-attr": "custom-value",
+                "data-controller": "w-example w-other",
+                # wrapper attribute should be preserved
+                "data-field-wrapper": "",
+            },
+            soup.attrs,
+        )

wagtail/admin/tests/test_userbar.py

@@ -1,6 +1,5 @@
 import json
 
-from django.conf import settings
 from django.contrib.auth.models import AnonymousUser, Permission
 from django.template import Context, Template
 from django.test import TestCase, override_settings
@@ -9,7 +8,7 @@ from django.utils import translation
 from django.utils.translation import gettext
 
 from wagtail import hooks
-from wagtail.admin.templatetags.wagtailadmin_tags import absolute_static
+from wagtail.admin.staticfiles import versioned_static
 from wagtail.admin.userbar import AccessibilityItem, Userbar
 from wagtail.coreutils import get_dummy_request
 from wagtail.models import PAGE_TEMPLATE_VAR, Locale, Page, Site
@@ -67,7 +66,7 @@ class TestUserbarTag(WagtailTestUtils, TestCase):
                 # Wagtail admin core CSS should be linked with absolute URL to
                 # ensure it works when loaded from a different domain
                 # (e.g. headless frontend)
-                absolute_static("wagtailadmin/css/core.css"),
+                f"http://localhost{versioned_static('wagtailadmin/css/core.css')}",
                 # Custom CSS must be changed appropriately if necessary
                 "/path/to/my/custom.css",
             ],
@@ -80,8 +79,8 @@ class TestUserbarTag(WagtailTestUtils, TestCase):
                 # Wagtail vendor and userbar JS should be linked with absolute
                 # URL to ensure it works when loaded from a different domain
                 # (e.g. headless frontend)
-                absolute_static("wagtailadmin/js/vendor.js"),
-                absolute_static("wagtailadmin/js/userbar.js"),
+                f"http://localhost{versioned_static('wagtailadmin/js/vendor.js')}",
+                f"http://localhost{versioned_static('wagtailadmin/js/userbar.js')}",
             ],
         )
 
@@ -136,9 +135,7 @@ class TestUserbarTag(WagtailTestUtils, TestCase):
         # Should render the "Go to Wagtail admin" link using an absolute URL
         soup = self.get_soup(content)
         admin_url = reverse("wagtailadmin_home")
-        admin_link = soup.select_one(
-            f"a[href='{settings.WAGTAILADMIN_BASE_URL}{admin_url}']"
-        )
+        admin_link = soup.select_one(f"a[href='http://localhost{admin_url}']")
         self.assertIsNotNone(admin_link)
         self.assertEqual(admin_link.text.strip(), "Go to Wagtail admin")
 
@@ -156,16 +153,12 @@ class TestUserbarTag(WagtailTestUtils, TestCase):
         soup = self.get_soup(content)
 
         edit_url = reverse("wagtailadmin_pages:edit", args=(self.homepage.id,))
-        edit_link = soup.select_one(
-            f"a[href='{settings.WAGTAILADMIN_BASE_URL}{edit_url}']"
-        )
+        edit_link = soup.select_one(f"a[href='http://localhost{edit_url}']")
         self.assertIsNotNone(edit_link)
         self.assertEqual(edit_link.text.strip(), "Edit this page")
 
         explore_url = reverse("wagtailadmin_explore", args=(self.parent_page.id,))
-        explore_link = soup.select_one(
-            f"a[href='{settings.WAGTAILADMIN_BASE_URL}{explore_url}']"
-        )
+        explore_link = soup.select_one(f"a[href='http://localhost{explore_url}']")
         self.assertIsNotNone(explore_link)
         self.assertEqual(explore_link.text.strip(), "Show in Explorer")
 
@@ -185,16 +178,12 @@ class TestUserbarTag(WagtailTestUtils, TestCase):
         soup = self.get_soup(content)
 
         edit_url = reverse("wagtailadmin_pages:edit", args=(self.homepage.id,))
-        edit_link = soup.select_one(
-            f"a[href='{settings.WAGTAILADMIN_BASE_URL}{edit_url}']"
-        )
+        edit_link = soup.select_one(f"a[href='http://localhost{edit_url}']")
         self.assertIsNotNone(edit_link)
         self.assertEqual(edit_link.text.strip(), "Edit this page")
 
         explore_url = reverse("wagtailadmin_explore", args=(self.parent_page.id,))
-        explore_link = soup.select_one(
-            f"a[href='{settings.WAGTAILADMIN_BASE_URL}{explore_url}']"
-        )
+        explore_link = soup.select_one(f"a[href='http://localhost{explore_url}']")
         self.assertIsNotNone(explore_link)
         self.assertEqual(explore_link.text.strip(), "Show in Explorer")
 
@@ -221,9 +210,7 @@ class TestUserbarTag(WagtailTestUtils, TestCase):
         # The explore link should still be visible
         soup = self.get_soup(content)
         explore_url = reverse("wagtailadmin_explore", args=(self.parent_page.id,))
-        explore_link = soup.select_one(
-            f"a[href='{settings.WAGTAILADMIN_BASE_URL}{explore_url}']"
-        )
+        explore_link = soup.select_one(f"a[href='http://localhost{explore_url}']")
         self.assertIsNotNone(explore_link)
         self.assertEqual(explore_link.text.strip(), "Show in Explorer")
 
@@ -718,7 +705,7 @@ class TestUserbarAddLink(WagtailTestUtils, TestCase):
         self.assertEqual(response.status_code, 200)
 
         # page allows subpages, so the 'add page' button should show
-        expected_url = settings.WAGTAILADMIN_BASE_URL + (
+        expected_url = self.request.build_absolute_uri(
             reverse("wagtailadmin_pages:add_subpage", args=(self.event_index.id,))
         )
         needle = f"""
@@ -762,7 +749,7 @@ class TestUserbarComponent(WagtailTestUtils, TestCase):
         items = soup.select("li")
         self.assertEqual(len(items), 2)
 
-        admin_url = f"{settings.WAGTAILADMIN_BASE_URL}{reverse('wagtailadmin_home')}"
+        admin_url = f"http://localhost{reverse('wagtailadmin_home')}"
         admin_item = items[0]
         admin_link = admin_item.select_one("a")
         self.assertIsNotNone(admin_link)
@@ -780,11 +767,18 @@ class TestUserbarComponent(WagtailTestUtils, TestCase):
     def test_render_no_request(self):
         rendered = Userbar().render_html({})
         soup = self.get_soup(rendered)
+        # Without a request provided, URLs should fall back to the
+        # WAGTAILADMIN_BASE_URL setting
+        base_url = "http://testserver"
+
+        userbar = soup.select_one("[data-wagtail-userbar]")
+        self.assertIsNotNone(userbar)
+        self.assertEqual(userbar.get("data-wagtail-userbar-origin"), base_url)
 
         items = soup.select("li")
         self.assertEqual(len(items), 2)
 
-        admin_url = f"{settings.WAGTAILADMIN_BASE_URL}{reverse('wagtailadmin_home')}"
+        admin_url = f"{base_url}{reverse('wagtailadmin_home')}"
         admin_item = items[0]
         admin_link = admin_item.select_one("a")
         self.assertIsNotNone(admin_link)
@@ -799,21 +793,44 @@ class TestUserbarComponent(WagtailTestUtils, TestCase):
             "Issues found | Accessibility",
         )
 
+        css_links = soup.select("link[rel='stylesheet']")
+        self.assertEqual(
+            [link.get("href") for link in css_links],
+            [
+                # Wagtail admin core CSS should be linked with absolute URL to
+                # ensure it works when loaded from a different domain
+                # (e.g. headless frontend)
+                f"{base_url}{versioned_static('wagtailadmin/css/core.css')}",
+                # Custom CSS must be changed appropriately if necessary
+                "/path/to/my/custom.css",
+            ],
+        )
+
+        scripts = soup.select("script[src]")
+        self.assertEqual(
+            [script.get("src") for script in scripts],
+            [
+                # Wagtail vendor and userbar JS should be linked with absolute
+                # URL to ensure it works when loaded from a different domain
+                # (e.g. headless frontend)
+                f"{base_url}{versioned_static('wagtailadmin/js/vendor.js')}",
+                f"{base_url}{versioned_static('wagtailadmin/js/userbar.js')}",
+            ],
+        )
+
     def test_render_minimal(self):
         rendered = Userbar().render_html({"request": self.request})
         soup = self.get_soup(rendered)
 
         userbar = soup.select_one("[data-wagtail-userbar]")
         self.assertIsNotNone(userbar)
-        self.assertEqual(
-            userbar.get("data-wagtail-userbar-origin"),
-            settings.WAGTAILADMIN_BASE_URL,
-        )
+        # The origin should be based on the request's scheme and host information
+        self.assertEqual(userbar.get("data-wagtail-userbar-origin"), "http://localhost")
 
         items = soup.select("li")
         self.assertEqual(len(items), 2)
 
-        admin_url = f"{settings.WAGTAILADMIN_BASE_URL}{reverse('wagtailadmin_home')}"
+        admin_url = f"http://localhost{reverse('wagtailadmin_home')}"
         admin_item = items[0]
         admin_link = admin_item.select_one("a")
         self.assertIsNotNone(admin_link)
@@ -844,7 +861,7 @@ class TestUserbarComponent(WagtailTestUtils, TestCase):
         self.assertEqual(len(links), 4)
         self.assertEqual(
             [link.get("href") for link in links],
-            [f"{settings.WAGTAILADMIN_BASE_URL}{url}" for url in expected_urls],
+            [f"http://localhost{url}" for url in expected_urls],
         )
 
         accessibility_button = soup.select_one("li button")
@@ -855,8 +872,8 @@ class TestUserbarComponent(WagtailTestUtils, TestCase):
         )
 
     @override_settings(WAGTAILADMIN_BASE_URL=None)
-    def test_render_without_admin_base_url_setting(self):
-        rendered = Userbar().render_html({"request": self.request})
+    def test_render_without_request_and_admin_base_url_setting(self):
+        rendered = Userbar().render_html({})
         soup = self.get_soup(rendered)
 
         userbar = soup.select_one("[data-wagtail-userbar]")
@@ -868,7 +885,8 @@ class TestUserbarComponent(WagtailTestUtils, TestCase):
         items = soup.select("li")
         self.assertEqual(len(items), 2)
 
-        # Becomes the root-relative URL since WAGTAILADMIN_BASE_URL is None
+        # Becomes the root-relative URL since no request is provided
+        # and WAGTAILADMIN_BASE_URL is None
         admin_url = reverse("wagtailadmin_home")
         admin_item = items[0]
         admin_link = admin_item.select_one("a")
@@ -883,3 +901,25 @@ class TestUserbarComponent(WagtailTestUtils, TestCase):
             button.get_text(separator=" | ", strip=True).strip(),
             "Issues found | Accessibility",
         )
+
+        css_links = soup.select("link[rel='stylesheet']")
+        self.assertEqual(
+            [link.get("href") for link in css_links],
+            [
+                # Cannot build absolute URL without a request and
+                # WAGTAILADMIN_BASE_URL, so should be root-relative
+                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],
+            [
+                # Cannot build absolute URL without a request and
+                # WAGTAILADMIN_BASE_URL, so should be root-relative
+                versioned_static("wagtailadmin/js/vendor.js"),
+                versioned_static("wagtailadmin/js/userbar.js"),
+            ],
+        )

wagtail/admin/tests/test_views_generic.py

@@ -2,6 +2,7 @@ from django.contrib.admin.utils import quote
 from django.test import TestCase
 from django.urls import reverse
 
+from wagtail.test.testapp.models import ModelWithStringTypePrimaryKey
 from wagtail.test.utils import WagtailTestUtils
 
 
@@ -37,6 +38,39 @@ class TestGenericIndexViewWithoutModel(WagtailTestUtils, TestCase):
         self.assertEqual(response_object_count, 4)
 
 
+class TestGenericCreateView(WagtailTestUtils, TestCase):
+    fixtures = ["test.json"]
+
+    def get(self, params={}):
+        return self.client.get(reverse("testapp_generic_create"), params)
+
+    def test_get_create_view(self):
+        response = self.get()
+        self.assertEqual(response.status_code, 200)
+        soup = self.get_soup(response.content)
+        h2 = soup.select_one("main h2")
+        self.assertIsNotNone(h2)
+        self.assertEqual(h2.text.strip(), "Model with string type primary key")
+        form = soup.select_one("main form")
+        self.assertIsNotNone(form)
+        id_input = form.select_one("input[name='custom_id']")
+        self.assertIsNotNone(id_input)
+        self.assertEqual(id_input.get("type"), "text")
+        content_input = form.select_one("input[name='content']")
+        self.assertIsNotNone(content_input)
+
+    def test_post_create_view(self):
+        post_data = {
+            "custom_id": "string-pk-3",
+            "content": "third modelwithstringtypeprimarykey model",
+        }
+        response = self.client.post(reverse("testapp_generic_create"), post_data)
+        self.assertEqual(response.status_code, 302)  # Redirect to index view
+        self.assertTrue(
+            ModelWithStringTypePrimaryKey.objects.filter(pk="string-pk-3").exists()
+        )
+
+
 class TestGenericEditView(WagtailTestUtils, TestCase):
     fixtures = ["test.json"]
 

wagtail/admin/tests/test_workflows.py

@@ -26,6 +26,7 @@ from wagtail.admin.utils import (
     get_latest_str,
     get_user_display_name,
 )
+from wagtail.locks import BasicLock
 from wagtail.models import (
     GroupApprovalTask,
     GroupPagePermission,
@@ -41,6 +42,8 @@ from wagtail.models import (
 )
 from wagtail.signals import page_published, published
 from wagtail.test.testapp.models import (
+    CustomLockTask,
+    CustomWorkflowLock,
     FullFeaturedSnippet,
     ModeratedModel,
     MultiPreviewModesPage,
@@ -4851,3 +4854,34 @@ class TestWorkflowStateEmailNotifier(BasePageWorkflowTests):
             with self.subTest(f"Testing with {notification}_notifications"):
                 notifier.notification = notification
                 self.assertSetEqual(notifier.get_valid_recipients(self.object), set())
+
+
+class TestCustomWorkflowLockOnTask(BasePageWorkflowTests):
+    def setup_workflow_and_tasks(self):
+        self.workflow = Workflow.objects.create(name="test_workflow")
+        self.task_1 = CustomLockTask.objects.create(name="test_task_1")
+        WorkflowTask.objects.create(
+            workflow=self.workflow, task=self.task_1, sort_order=1
+        )
+
+    def test_custom_lock_class(self):
+        self.post("submit")
+        response = self.client.get(self.get_url("edit"))
+        self.assertContains(response, "If there is a door, there must be a key")
+        self.assertIsInstance(self.object.get_lock(), CustomWorkflowLock)
+
+    @mock.patch.object(CustomLockTask, "lock_class", new_callable=mock.PropertyMock)
+    def test_typeerror_if_custom_lock_class_inherits_basic_locks(self, mock_property):
+        mock_property.return_value = BasicLock
+
+        self.post("submit")
+
+        with self.assertRaises(TypeError):
+            self.client.get(self.get_url("edit"))
+
+
+class TestCustomWorkflowLockOnTaskWithSnippets(
+    TestCustomWorkflowLockOnTask,
+    BaseSnippetWorkflowTests,
+):
+    pass