wagtail 6.4rc1__py3-none-any.whl → 7.0__py3-none-any.whl

wagtail/admin/tests/test_block_preview.py

@@ -24,6 +24,7 @@ class TestStreamFieldBlockPreviewView(WagtailTestUtils, TestCase):
             description="A single line of text",
             preview_value="Hello, world!",
         )
+        block.set_name("single_line_text")
         response = self.get(block)
         self.assertEqual(response.status_code, 200)
         soup = self.get_soup(response.content)
@@ -45,6 +46,9 @@ class TestStreamFieldBlockPreviewView(WagtailTestUtils, TestCase):
         self.assertIsNotNone(main)
         self.assertEqual(main.text.strip(), "Hello, world!")
 
+        wrapper = main.select_one("div.block-single_line_text")
+        self.assertIsNotNone(wrapper)
+
     def test_nonexisting_block(self):
         response = self.client.get(reverse("wagtailadmin_block_preview"))
         self.assertEqual(response.status_code, 404)

wagtail/admin/tests/test_buttons_hooks.py

@@ -10,7 +10,6 @@ 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 RemovedInWagtail70Warning
 
 
 class TestButtonsHooks(WagtailTestUtils, TestCase):
@@ -28,31 +27,6 @@ class TestButtonsHooks(WagtailTestUtils, TestCase):
 
 
 class TestPageListingButtonsHooks(TestButtonsHooks):
-    def test_register_page_listing_buttons_old_signature(self):
-        def page_listing_buttons_old_signature(page, page_perms, 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_old_signature
-        ):
-            with self.assertWarnsMessage(
-                RemovedInWagtail70Warning,
-                "`register_page_listing_buttons` hook functions should accept a `user` argument instead of `page_perms`",
-            ):
-                response = self.client.get(
-                    reverse("wagtailadmin_explore", args=(self.root_page.id,))
-                )
-
-        self.assertEqual(response.status_code, 200)
-        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):
@@ -79,34 +53,6 @@ class TestPageListingButtonsHooks(TestButtonsHooks):
 
 
 class TestPageListingMoreButtonsHooks(TestButtonsHooks):
-    def test_register_page_listing_more_buttons_with_old_signature(self):
-        def page_listing_more_buttons(page, page_perms, next_url=None):
-            yield wagtailadmin_widgets.Button(
-                'Another useless button in default "More" dropdown',
-                "/custom-url",
-                priority=10,
-            )
-
-        with hooks.register_temporarily(
-            "register_page_listing_more_buttons", page_listing_more_buttons
-        ), self.assertWarnsMessage(
-            RemovedInWagtail70Warning,
-            "`register_page_listing_more_buttons` hook functions should accept a `user` argument instead of `page_perms`",
-        ):
-            response = self.client.get(
-                reverse("wagtailadmin_explore", args=(self.root_page.id,))
-            )
-
-        self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed(
-            response, "wagtailadmin/pages/listing/_button_with_dropdown.html"
-        )
-        self.assertTemplateUsed(response, "wagtailadmin/shared/buttons.html")
-
-        self.assertContains(
-            response, "Another useless button in default "More" dropdown"
-        )
-
     def test_register_page_listing_more_buttons_with_new_signature(self):
         def page_listing_more_buttons(page, user, next_url=None):
             if not isinstance(user, AbstractBaseUser):
@@ -135,69 +81,6 @@ class TestPageListingMoreButtonsHooks(TestButtonsHooks):
             response, "Another useless button in default "More" dropdown"
         )
 
-    def test_button_with_dropdown_from_hook_accepts_page_perms_argument(self):
-        page = self.root_page
-
-        with self.assertWarnsMessage(
-            RemovedInWagtail70Warning,
-            "ButtonWithDropdownFromHook should be passed a `user` argument instead of `page_perms`",
-        ):
-            button = wagtailadmin_widgets.ButtonWithDropdownFromHook(
-                "One more more button",
-                hook_name="register_page_listing_one_more_more_buttons",
-                page=page,
-                page_perms=page.permissions_for_user(self.user),
-                next_url="/custom-url",
-                attrs={"target": "_blank", "rel": "noreferrer"},
-                priority=50,
-            )
-
-        self.assertEqual(button.user, self.user)
-
-    def test_custom_button_with_dropdown_with_old_signature(self):
-        def page_custom_listing_buttons(page, user, next_url=None):
-            yield wagtailadmin_widgets.ButtonWithDropdownFromHook(
-                "One more more button",
-                hook_name="register_page_listing_one_more_more_buttons",
-                page=page,
-                user=user,
-                next_url=next_url,
-                attrs={"target": "_blank", "rel": "noreferrer"},
-                priority=50,
-            )
-
-        def page_custom_listing_more_buttons(page, page_perms, next_url=None):
-            yield wagtailadmin_widgets.Button(
-                'Another useless dropdown button in "One more more button" dropdown',
-                "/custom-url",
-                priority=10,
-            )
-
-        with hooks.register_temporarily(
-            "register_page_listing_buttons", page_custom_listing_buttons
-        ), hooks.register_temporarily(
-            "register_page_listing_one_more_more_buttons",
-            page_custom_listing_more_buttons,
-        ), self.assertWarnsMessage(
-            RemovedInWagtail70Warning,
-            "`register_page_listing_one_more_more_buttons` hook functions should accept a `user` argument instead of `page_perms`",
-        ):
-            response = self.client.get(
-                reverse("wagtailadmin_explore", args=(self.root_page.id,))
-            )
-
-        self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed(
-            response, "wagtailadmin/pages/listing/_button_with_dropdown.html"
-        )
-        self.assertTemplateUsed(response, "wagtailadmin/shared/buttons.html")
-
-        self.assertContains(response, "One more more button")
-        self.assertContains(
-            response,
-            "Another useless dropdown button in "One more more button" dropdown",
-        )
-
     def test_custom_button_with_dropdown_with_new_signature(self):
         def page_custom_listing_buttons(page, user, next_url=None):
             yield wagtailadmin_widgets.ButtonWithDropdownFromHook(
@@ -220,11 +103,15 @@ class TestPageListingMoreButtonsHooks(TestButtonsHooks):
                 priority=10,
             )
 
-        with hooks.register_temporarily(
-            "register_page_listing_buttons", page_custom_listing_buttons
-        ), hooks.register_temporarily(
-            "register_page_listing_one_more_more_buttons",
-            page_custom_listing_more_buttons,
+        with (
+            hooks.register_temporarily(
+                "register_page_listing_buttons",
+                page_custom_listing_buttons,
+            ),
+            hooks.register_temporarily(
+                "register_page_listing_one_more_more_buttons",
+                page_custom_listing_more_buttons,
+            ),
         ):
             response = self.client.get(
                 reverse("wagtailadmin_explore", args=(self.root_page.id,))
@@ -321,29 +208,6 @@ class TestPageListingMoreButtonsHooks(TestButtonsHooks):
 
 
 class TestPageHeaderButtonsHooks(TestButtonsHooks):
-    def test_register_page_header_buttons_old_signature(self):
-        def custom_page_header_buttons(page, page_perms, next_url=None):
-            yield wagtailadmin_widgets.Button(
-                "Another useless header button", "/custom-url", priority=10
-            )
-
-        with hooks.register_temporarily(
-            "register_page_header_buttons", custom_page_header_buttons
-        ), self.assertWarnsMessage(
-            RemovedInWagtail70Warning,
-            "`register_page_header_buttons` hook functions should accept a `user` argument instead of `page_perms`",
-        ):
-            response = self.client.get(
-                reverse("wagtailadmin_pages:edit", args=(self.root_page.id,))
-            )
-
-        self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed(
-            response, "wagtailadmin/pages/listing/_page_header_buttons.html"
-        )
-
-        self.assertContains(response, "Another useless header button")
-
     def test_register_page_header_buttons_new_signature(self):
         def custom_page_header_buttons(page, user, view_name, next_url=None):
             if not isinstance(user, AbstractBaseUser):

wagtail/admin/tests/test_collections_views.py

@@ -810,3 +810,63 @@ class TestSetCollectionPrivacy(CollectionInstanceTestUtils, WagtailTestUtils, Te
             args=(self.root_collection.pk,),
         )
         self.assertEqual(link.get("href"), parent_edit_url)
+
+
+class TestCollectionPrivacyStatusLabels(WagtailTestUtils, TestCase):
+    def setUp(self):
+        self.user = self.login()
+
+        self.root_collection = Collection.get_first_root_node()
+        self.public_collection = self.root_collection.add_child(name="Public_photos1")
+        self.private_collection = self.root_collection.add_child(name="Private_photos1")
+        CollectionViewRestriction.objects.create(
+            collection=self.private_collection,
+            restriction_type=CollectionViewRestriction.LOGIN,
+        )
+        self.root_collection.refresh_from_db()
+        self.private_collection.refresh_from_db()
+        self.public_collection.refresh_from_db()
+
+        self.sub_private_collection = self.private_collection.add_child(
+            name="Sub_private_photos1"
+        )
+
+        self.sub_public_collection = self.public_collection.add_child(
+            name="Sub_public_photos1"
+        )
+
+    def test_admin_displays_private_tag_for_private_base_collections(self):
+        request = self.client.get(
+            reverse("wagtailadmin_collections:edit", args=[self.private_collection.pk])
+        )
+
+        self.assertTrue('class="privacy-indicator private"' in str(request.content))
+        self.assertFalse('class="privacy-indicator "' in str(request.content))
+
+    def test_admin_displays_private_tag_for_private_sub_collections(self):
+        request = self.client.get(
+            reverse(
+                "wagtailadmin_collections:edit", args=[self.sub_private_collection.pk]
+            )
+        )
+
+        self.assertTrue('class="privacy-indicator private"' in str(request.content))
+        self.assertFalse('class="privacy-indicator public"' in str(request.content))
+
+    def test_admin_displays_public_tag_for_public_base_collections(self):
+        request = self.client.get(
+            reverse("wagtailadmin_collections:edit", args=[self.public_collection.pk])
+        )
+
+        self.assertTrue('class="privacy-indicator public"' in str(request.content))
+        self.assertFalse('class="privacy-indicator private"' in str(request.content))
+
+    def test_admin_displays_public_tag_for_public_sub_collections(self):
+        request = self.client.get(
+            reverse(
+                "wagtailadmin_collections:edit", args=[self.sub_public_collection.pk]
+            )
+        )
+
+        self.assertTrue('class="privacy-indicator public"' in str(request.content))
+        self.assertFalse('class="privacy-indicator private"' in str(request.content))

wagtail/admin/tests/test_contentstate.py

@@ -14,7 +14,7 @@ from wagtail.embeds.models import Embed
 
 def content_state_equal(v1, v2, match_keys=False):
     "Test whether two contentState structures are equal, ignoring 'key' properties if match_keys=False"
-    if type(v1) != type(v2):
+    if type(v1) is not type(v2):
         return False
 
     if isinstance(v1, dict):

wagtail/admin/tests/test_dashboard.py

@@ -16,6 +16,7 @@ from wagtail.coreutils import get_dummy_request
 from wagtail.models import GroupPagePermission, Page, Workflow, WorkflowContentType
 from wagtail.test.testapp.models import FullFeaturedSnippet, SimplePage
 from wagtail.test.utils import WagtailTestUtils
+from wagtail.users.models import UserProfile
 
 
 class TestRecentEditsPanel(WagtailTestUtils, TestCase):
@@ -402,3 +403,27 @@ class WorkflowObjectsToModerateQueryCount(WagtailTestUtils, TestCase):
         ]
         titles = [e.get_text(strip=True) for e in soup.select(".title-wrapper a")]
         self.assertEqual(titles, expected_titles)
+
+
+class CommonAdminBaseTemplate(WagtailTestUtils, TestCase):
+    def setUp(self):
+        self.user = self.login()
+
+    def test_common_admin_base_template(self):
+        response = self.client.get(reverse("wagtailadmin_home"))
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, "wagtailadmin/skeleton.html")
+        self.assertTemplateUsed(response, "wagtailadmin/admin_base.html")
+
+    def test_meta_color_scheme(self):
+        profile = UserProfile.get_for_user(self.user)
+        profile.theme = "dark"
+        profile.save()
+
+        response = self.client.get(reverse("wagtailadmin_home"))
+        self.assertEqual(response.status_code, 200)
+        soup = self.get_soup(response.content)
+        meta_tag = soup.find("meta", attrs={"name": "color-scheme"})
+
+        self.assertIsNotNone(meta_tag)
+        self.assertEqual(meta_tag["content"], "dark")

wagtail/admin/tests/test_edit_handlers.py

@@ -4,6 +4,7 @@ from functools import wraps
 from typing import Any, Optional
 from unittest import mock
 
+from django import VERSION as DJANGO_VERSION
 from django import forms
 from django.conf import settings
 from django.contrib.auth import get_user_model
@@ -216,6 +217,22 @@ class TestGetFormForModel(TestCase):
         self.assertEqual(type(form.fields["date_from"]), forms.DateField)
         self.assertEqual(type(form.fields["date_from"].widget), forms.PasswordInput)
 
+    def test_urlfield_assume_scheme_override(self):
+        EventPageForm = get_form_for_model(
+            EventPage,
+            form_class=WagtailAdminPageForm,
+            fields=["signup_link"],
+        )
+        form = EventPageForm()
+
+        field = form.fields["signup_link"]
+        self.assertEqual(type(field), forms.URLField)
+
+        # Remove the condition and keep the assertion when the minimum Django
+        # version is >= 5.0.
+        if DJANGO_VERSION >= (5, 0):
+            self.assertEqual(field.assume_scheme, "https")
+
     def test_tag_widget_is_passed_tag_model(self):
         RestaurantPageForm = get_form_for_model(
             RestaurantPage,
@@ -869,6 +886,12 @@ class TestFieldPanel(TestCase):
             instance=self.event,
         )
 
+    def test_accessing_db_field_before_bind(self):
+        field_panel = FieldPanel("barbecue")
+
+        with self.assertRaises(ImproperlyConfigured):
+            field_panel.db_field
+
     def test_non_model_field(self):
         # defining a FieldPanel for a field which isn't part of a model is OK,
         # because it might be defined on the form instead
@@ -1531,6 +1554,29 @@ class TestInlinePanel(WagtailTestUtils, TestCase):
         # Label is the singular term, derived from the related model's verbose_name
         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)]
+        ).bind_to_model(EventPage)
+
+        EventPageForm = speaker_object_list.get_form_class()
+        form = EventPageForm(instance=event_page)
+
+        bound_panel = speaker_object_list.get_bound_panel(
+            instance=event_page, form=form, request=self.request
+        )
+
+        formset = bound_panel.children[0].formset
+
+        for index, form in enumerate(formset.forms):
+            self.assertEqual(
+                str(form.fields["ORDER"].widget.attrs.get("value")),
+                str(index + 1),
+                f"Initial form at index {index} should have ORDER value {index + 1}",
+            )
+
 
 class TestNonOrderableInlinePanel(WagtailTestUtils, TestCase):
     fixtures = ["test.json"]
@@ -1732,6 +1778,15 @@ class TestCommentPanel(WagtailTestUtils, TestCase):
                 for panel in expand_panel_list(Page, Page.settings_panels)
             )
         )
+
+        self.login()
+        response = self.client.get(reverse("wagtailadmin_pages:edit", args=[3]))
+        self.assertEqual(response.status_code, 200)
+
+        soup = self.get_soup(response.content)
+        scripts = soup.select("script[src='/static/wagtailadmin/js/comments.js']")
+        self.assertEqual(len(scripts), 0)
+
         form_class = Page.get_edit_handler().get_form_class()
         form = form_class()
         self.assertFalse(form.show_comments_toggle)
@@ -1746,6 +1801,15 @@ class TestCommentPanel(WagtailTestUtils, TestCase):
                 for panel in expand_panel_list(Page, Page.settings_panels)
             )
         )
+
+        self.login()
+        response = self.client.get(reverse("wagtailadmin_pages:edit", args=[3]))
+        self.assertEqual(response.status_code, 200)
+
+        soup = self.get_soup(response.content)
+        scripts = soup.select("script[src='/static/wagtailadmin/js/comments.js']")
+        self.assertEqual(len(scripts), 1)
+
         form_class = Page.get_edit_handler().get_form_class()
         form = form_class()
         self.assertTrue(form.show_comments_toggle)

wagtail/admin/tests/test_forms.py

@@ -2,6 +2,8 @@ from django.forms.fields import CharField
 from django.test import SimpleTestCase, TestCase
 
 from wagtail.admin.forms.auth import LoginForm, PasswordResetForm
+from wagtail.admin.forms.models import WagtailAdminModelForm
+from wagtail.test.testapp.models import Advert
 
 
 class CustomLoginForm(LoginForm):
@@ -28,3 +30,39 @@ class TestPasswordResetForm(SimpleTestCase):
     def test_extra_fields(self):
         form = CustomPasswordResetForm()
         self.assertEqual(list(form.extra_fields), [("captcha", form["captcha"])])
+
+
+class TestDeferRequiredFields(TestCase):
+    def test_defer_required_fields(self):
+        class AdvertForm(WagtailAdminModelForm):
+            class Meta:
+                model = Advert
+                fields = ["url", "text"]
+                defer_required_on_fields = ["text"]
+
+        form = AdvertForm(
+            {
+                "url": "https://www.example.com",
+                "text": "",
+            }
+        )
+        self.assertFalse(form.is_valid())
+
+        form = AdvertForm(
+            {
+                "url": "https://www.example.com",
+                "text": "",
+            }
+        )
+        form.defer_required_fields()
+        self.assertTrue(form.is_valid())
+
+        form = AdvertForm(
+            {
+                "url": "https://www.example.com",
+                "text": "",
+            }
+        )
+        form.defer_required_fields()
+        form.restore_required_fields()
+        self.assertFalse(form.is_valid())

wagtail/admin/tests/test_keyboard_shortcuts.py

@@ -1,13 +1,68 @@
 import json
 import re
 
-from django.test import TestCase
+from django.test import RequestFactory, TestCase, override_settings
 from django.test.client import Client
 from django.urls import reverse
 
+from wagtail.admin.utils import get_keyboard_key_labels_from_request
 from wagtail.test.utils import WagtailTestUtils
 
 
+class TestGetKeyboardKeyLabelsFromRequestUtil(TestCase):
+    def setUp(self):
+        self.factory = RequestFactory()
+        self.client = Client()
+
+    def test_get_keyboard_key_labels_for_default(self):
+        """
+        Test the default case for keyboard key labels where no User-Agent is provided.
+        This simulates an edge case where the request does not contain a User-Agent.
+        """
+        request = self.factory.get("/")
+        key_labels = get_keyboard_key_labels_from_request(request)
+
+        self.assertEqual(key_labels.ALT, "Alt")
+        self.assertEqual(key_labels.CMD, "Ctrl")
+        self.assertEqual(key_labels.CTRL, "Ctrl")
+        self.assertEqual(key_labels.MOD, "Ctrl")
+
+    def test_get_keyboard_key_labels_for_mac_os(self):
+        """
+        Test the keyboard key labels with a Mac user agent.
+        """
+        self.client.defaults["HTTP_USER_AGENT"] = (
+            "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) "
+            "AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.0.0 Safari/537.36"
+        )
+        response = self.client.get(reverse("wagtailadmin_home"))
+
+        key_labels = get_keyboard_key_labels_from_request(response.wsgi_request)
+
+        self.assertEqual(key_labels.ALT, "⌥")
+        self.assertEqual(key_labels.CMD, "⌘")
+        self.assertEqual(key_labels.CTRL, "^")
+        self.assertEqual(key_labels.ENTER, "Return")
+        self.assertEqual(key_labels.MOD, "⌘")
+
+    def test_get_keyboard_key_labels_for_windows(self):
+        """
+        Test the keyboard key labels with a Windows user agent.
+        """
+        self.client.defaults["HTTP_USER_AGENT"] = (
+            "Mozilla/5.0 (Windows NT 10.0; Win64; x64) "
+            "AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.0.0 Safari/537.36"
+        )
+        response = self.client.get(reverse("wagtailadmin_home"))
+
+        key_labels = get_keyboard_key_labels_from_request(response.wsgi_request)
+
+        self.assertEqual(key_labels.ALT, "Alt")
+        self.assertEqual(key_labels.CMD, "Ctrl")
+        self.assertEqual(key_labels.CTRL, "Ctrl")
+        self.assertEqual(key_labels.MOD, "Ctrl")
+
+
 class TestKeyboardShortcutsDialog(WagtailTestUtils, TestCase):
     def setUp(self):
         self.login()
@@ -54,6 +109,48 @@ class TestKeyboardShortcutsDialog(WagtailTestUtils, TestCase):
         )
         self.assertIn("Keyboard shortcut", shortcuts_dialog.find("thead").prettify())
 
+    @override_settings(WAGTAILADMIN_COMMENTS_ENABLED=True)
+    def test_keyboard_shortcuts_with_comments_enabled(self):
+        """
+        Test the presence of a comments shortcut if Comments enabled
+        """
+        response = self.client.get(reverse("wagtailadmin_home"))
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(
+            response, "wagtailadmin/shared/keyboard_shortcuts_dialog.html"
+        )
+
+        soup = self.get_soup(response.content)
+
+        shortcuts_dialog = soup.select_one("#keyboard-shortcuts-dialog")
+        all_shortcuts_text = [
+            kbd.string.strip() for kbd in shortcuts_dialog.select("kbd")
+        ]
+
+        self.assertIn("Add or show comments", shortcuts_dialog.prettify())
+        self.assertIn("Ctrl + Alt + m", all_shortcuts_text)
+
+    @override_settings(WAGTAILADMIN_COMMENTS_ENABLED=False)
+    def test_keyboard_shortcuts_with_comments_disabled(self):
+        """
+        Test the absence of a comments shortcut if Comments disabled
+        """
+        response = self.client.get(reverse("wagtailadmin_home"))
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(
+            response, "wagtailadmin/shared/keyboard_shortcuts_dialog.html"
+        )
+
+        soup = self.get_soup(response.content)
+
+        shortcuts_dialog = soup.select_one("#keyboard-shortcuts-dialog")
+        all_shortcuts_text = [
+            kbd.string.strip() for kbd in shortcuts_dialog.select("kbd")
+        ]
+
+        self.assertNotIn("comments", shortcuts_dialog.prettify())
+        self.assertNotIn("Ctrl + Alt + m", all_shortcuts_text)
+
 
 class TestMacKeyboardShortcutsDialog(WagtailTestUtils, TestCase):
     def setUp(self):
@@ -78,7 +175,46 @@ class TestMacKeyboardShortcutsDialog(WagtailTestUtils, TestCase):
         # Check that the keyboard shortcuts dialog has Mac-specific content
         soup = self.get_soup(response.content)
         shortcuts_dialog = soup.select_one("#keyboard-shortcuts-dialog")
-        all_shortcuts = shortcuts_dialog.select("kbd")
-        for shortcut in all_shortcuts:
-            # All shortcuts should have the ⌘ symbol
-            self.assertIn("⌘", shortcut.prettify())
+        self.assertIn("⌘", shortcuts_dialog.prettify())
+
+    @override_settings(WAGTAILADMIN_COMMENTS_ENABLED=True)
+    def test_keyboard_shortcuts_with_comments_enabled(self):
+        """
+        Test the presence comments shortcut if Comments enabled
+        """
+        response = self.client.get(reverse("wagtailadmin_home"))
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(
+            response, "wagtailadmin/shared/keyboard_shortcuts_dialog.html"
+        )
+
+        soup = self.get_soup(response.content)
+
+        shortcuts_dialog = soup.select_one("#keyboard-shortcuts-dialog")
+        all_shortcuts_text = [
+            kbd.string.strip() for kbd in shortcuts_dialog.select("kbd")
+        ]
+
+        self.assertIn("Add or show comments", shortcuts_dialog.prettify())
+        self.assertIn("^ + ⌥ + m", all_shortcuts_text)
+
+    @override_settings(WAGTAILADMIN_COMMENTS_ENABLED=False)
+    def test_keyboard_shortcuts_with_comments_disabled(self):
+        """
+        Test the absence comments shortcut if Comments disabled
+        """
+        response = self.client.get(reverse("wagtailadmin_home"))
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(
+            response, "wagtailadmin/shared/keyboard_shortcuts_dialog.html"
+        )
+
+        soup = self.get_soup(response.content)
+
+        shortcuts_dialog = soup.select_one("#keyboard-shortcuts-dialog")
+        all_shortcuts_text = [
+            kbd.string.strip() for kbd in shortcuts_dialog.select("kbd")
+        ]
+
+        self.assertNotIn("comments", shortcuts_dialog.prettify())
+        self.assertNotIn("^ + ⌥ + m", all_shortcuts_text)

wagtail/admin/tests/test_page_chooser.py

@@ -997,7 +997,7 @@ class TestChooserExternalLinkWithNonRootServePath(TestChooserExternalLink):
         self.assertEqual(response_json["internal"]["id"], self.internal_page.pk)
 
     def test_convert_external_link_with_query_parameters_to_internal_link_with_serve_path(
-        self
+        self,
     ):
         # https://github.com/wagtail/wagtail/issues/11996
         # New behaviour: when using a non-root serve path, entering a full
@@ -1067,7 +1067,7 @@ class TestChooserExternalLinkWithNonRootServePath(TestChooserExternalLink):
 
     @override_settings(WAGTAILADMIN_EXTERNAL_LINK_CONVERSION="")
     def test_no_conversion_external_to_internal_link_when_disabled_with_serve_path(
-        self
+        self,
     ):
         url = f"http://localhost/{self.prefix}about/"
         title = "about"