wagtail 7.2.1__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_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
 

wagtail/admin/tests/test_editing_sessions.py

@@ -282,12 +282,16 @@ class TestPingView(WagtailTestUtils, TestCase):
         self.assertIn("Vic Otheruser saved a new version", session_text)
         self.assertNotIn("Currently viewing", session_text)
         dialog_title = soup.select_one(
-            'template[data-w-teleport-target-value="#title-text-w-overwrite-changes-dialog"]'
+            "template"
+            '[data-w-teleport-target-value="#title-text-w-overwrite-changes-dialog"]'
+            '[data-w-teleport-mode-value="textContent"]'
         )
         self.assertIsNotNone(dialog_title)
         self.assertIn("Vic Otheruser saved a new version", dialog_title.string)
         dialog_subtitle = soup.select_one(
-            'template[data-w-teleport-target-value="#subtitle-w-overwrite-changes-dialog"]'
+            "template"
+            '[data-w-teleport-target-value="#subtitle-w-overwrite-changes-dialog"]'
+            '[data-w-teleport-mode-value="textContent"]'
         )
         self.assertIsNotNone(dialog_subtitle)
         self.assertIn(
@@ -328,6 +332,179 @@ class TestPingView(WagtailTestUtils, TestCase):
             ],
         )
 
+        soup = self.get_soup(response_json["html"])
+        rendered_sessions = soup.select("ol.w-editing-sessions__list li")
+        self.assertEqual(len(rendered_sessions), 1)
+        session_text = rendered_sessions[0].text
+        self.assertIn("Vic Otheruser saved a new version", session_text)
+        self.assertNotIn("Currently viewing", session_text)
+        dialog_title = soup.select_one(
+            "template"
+            '[data-w-teleport-target-value="#title-text-w-overwrite-changes-dialog"]'
+            '[data-w-teleport-mode-value="textContent"]'
+        )
+        self.assertIsNotNone(dialog_title)
+        self.assertIn(
+            "Vic Otheruser saved a new version",
+            dialog_title.string,
+        )
+        dialog_subtitle = soup.select_one(
+            "template"
+            '[data-w-teleport-target-value="#subtitle-w-overwrite-changes-dialog"]'
+            '[data-w-teleport-mode-value="textContent"]'
+        )
+        self.assertIsNotNone(dialog_subtitle)
+        self.assertIn(
+            "Proceeding will overwrite the changes made by Vic Otheruser. "
+            "Refreshing the page will show you the new changes, but you will lose any of your unsaved changes.",
+            dialog_subtitle.string,
+        )
+
+        self.session.refresh_from_db()
+        self.assertEqual(self.session.last_seen_at, TIMESTAMP_NOW)
+        self.assertFalse(self.session.is_editing)
+
+    @freeze_time(TIMESTAMP_NOW)
+    def test_ping_with_overwritten_revision(self):
+        # Simulate other user creating a new revision to be used for autosave
+        with freeze_time(TIMESTAMP_1):
+            loaded_revision = self.page.save_revision(user=self.other_user)
+
+        loaded_timestamp = loaded_revision.created_at.isoformat()
+        response = self.client.post(
+            reverse(
+                "wagtailadmin_editing_sessions:ping",
+                args=("wagtailcore", "page", self.page.id, self.session.id),
+            ),
+            {
+                "revision_id": self.original_revision.id,
+                "revision_created_at": loaded_timestamp,
+            },
+        )
+        self.assertEqual(response.status_code, 200)
+        response_json = response.json()
+        self.assertEqual(response_json["session_id"], self.session.id)
+
+        # no revisions have been saved since the original revision
+        self.assertEqual(
+            response_json["other_sessions"],
+            [
+                {
+                    "session_id": self.other_session.id,
+                    "user": "Vic Otheruser",
+                    "last_seen_at": TIMESTAMP_2.isoformat(),
+                    "is_editing": False,
+                    "revision_id": None,
+                },
+            ],
+        )
+
+        soup = self.get_soup(response_json["html"])
+        rendered_sessions = soup.select("ol.w-editing-sessions__list li")
+        self.assertEqual(len(rendered_sessions), 1)
+        session_text = rendered_sessions[0].text
+        self.assertIn("Vic Otheruser", session_text)
+        self.assertIn("Currently viewing", session_text)
+        self.assertNotIn("saved a new version", session_text)
+
+        self.session.refresh_from_db()
+        self.assertEqual(self.session.last_seen_at, TIMESTAMP_NOW)
+        self.assertFalse(self.session.is_editing)
+
+        # Simulate other user doing an autosave by overwriting the same revision
+        # that we have loaded
+        with freeze_time(TIMESTAMP_3):
+            self.page.save_revision(
+                user=self.other_user,
+                overwrite_revision=loaded_revision,
+            )
+
+        response = self.client.post(
+            reverse(
+                "wagtailadmin_editing_sessions:ping",
+                args=("wagtailcore", "page", self.page.id, self.session.id),
+            ),
+            {
+                "revision_id": self.original_revision.id,
+                "revision_created_at": loaded_timestamp,
+            },
+        )
+        self.assertEqual(response.status_code, 200)
+        response_json = response.json()
+        self.assertEqual(response_json["session_id"], self.session.id)
+
+        # the overwritten revision should be indicated in the response
+        # (and last_seen_at should reflect it), even though it has the same ID
+        # as the loaded revision
+        self.assertEqual(
+            response_json["other_sessions"],
+            [
+                {
+                    "session_id": self.other_session.id,
+                    "user": "Vic Otheruser",
+                    "last_seen_at": TIMESTAMP_3.isoformat(),
+                    "is_editing": False,
+                    "revision_id": loaded_revision.id,
+                },
+            ],
+        )
+
+        soup = self.get_soup(response_json["html"])
+        rendered_sessions = soup.select("ol.w-editing-sessions__list li")
+        self.assertEqual(len(rendered_sessions), 1)
+        session_text = rendered_sessions[0].text
+        self.assertIn("Vic Otheruser saved a new version", session_text)
+        self.assertNotIn("Currently viewing", session_text)
+        dialog_title = soup.select_one(
+            'template[data-w-teleport-target-value="#title-text-w-overwrite-changes-dialog"]'
+        )
+        self.assertIsNotNone(dialog_title)
+        self.assertIn("Vic Otheruser saved a new version", dialog_title.string)
+        dialog_subtitle = soup.select_one(
+            'template[data-w-teleport-target-value="#subtitle-w-overwrite-changes-dialog"]'
+        )
+        self.assertIsNotNone(dialog_subtitle)
+        self.assertIn(
+            "Proceeding will overwrite the changes made by Vic Otheruser. "
+            "Refreshing the page will show you the new changes, but you will lose any of your unsaved changes.",
+            dialog_subtitle.string,
+        )
+
+        self.session.refresh_from_db()
+        self.assertEqual(self.session.last_seen_at, TIMESTAMP_NOW)
+        self.assertFalse(self.session.is_editing)
+
+        self.other_session.delete()
+
+        response = self.client.post(
+            reverse(
+                "wagtailadmin_editing_sessions:ping",
+                args=("wagtailcore", "page", self.page.id, self.session.id),
+            ),
+            {
+                "revision_id": self.original_revision.id,
+                "revision_created_at": loaded_timestamp,
+            },
+        )
+        self.assertEqual(response.status_code, 200)
+        response_json = response.json()
+        self.assertEqual(response_json["session_id"], self.session.id)
+
+        # the overwritten revision should still appear as an "other session" in
+        # the response, even though the editing session record has been deleted
+        self.assertEqual(
+            response_json["other_sessions"],
+            [
+                {
+                    "session_id": None,
+                    "user": "Vic Otheruser",
+                    "last_seen_at": TIMESTAMP_3.isoformat(),
+                    "is_editing": False,
+                    "revision_id": loaded_revision.id,
+                },
+            ],
+        )
+
         soup = self.get_soup(response_json["html"])
         rendered_sessions = soup.select("ol.w-editing-sessions__list li")
         self.assertEqual(len(rendered_sessions), 1)
@@ -417,7 +594,9 @@ class TestPingView(WagtailTestUtils, TestCase):
         self.assertIn("Gordon Thirduser saved a new version", session_text)
         self.assertNotIn("Currently viewing", session_text)
         dialog_title = soup.select_one(
-            'template[data-w-teleport-target-value="#title-text-w-overwrite-changes-dialog"]'
+            "template"
+            '[data-w-teleport-target-value="#title-text-w-overwrite-changes-dialog"]'
+            '[data-w-teleport-mode-value="textContent"]'
         )
         self.assertIsNotNone(dialog_title)
         self.assertIn(
@@ -425,7 +604,9 @@ class TestPingView(WagtailTestUtils, TestCase):
             dialog_title.string,
         )
         dialog_subtitle = soup.select_one(
-            'template[data-w-teleport-target-value="#subtitle-w-overwrite-changes-dialog"]'
+            "template"
+            '[data-w-teleport-target-value="#subtitle-w-overwrite-changes-dialog"]'
+            '[data-w-teleport-mode-value="textContent"]'
         )
         self.assertIsNotNone(dialog_subtitle)
         self.assertIn(
@@ -487,7 +668,9 @@ class TestPingView(WagtailTestUtils, TestCase):
         self.assertIn("System saved a new version", session_text)
         self.assertNotIn("Currently viewing", session_text)
         dialog_title = soup.select_one(
-            'template[data-w-teleport-target-value="#title-text-w-overwrite-changes-dialog"]'
+            "template"
+            '[data-w-teleport-target-value="#title-text-w-overwrite-changes-dialog"]'
+            '[data-w-teleport-mode-value="textContent"]'
         )
         self.assertIsNotNone(dialog_title)
         self.assertIn(
@@ -495,7 +678,9 @@ class TestPingView(WagtailTestUtils, TestCase):
             dialog_title.string,
         )
         dialog_subtitle = soup.select_one(
-            'template[data-w-teleport-target-value="#subtitle-w-overwrite-changes-dialog"]'
+            "template"
+            '[data-w-teleport-target-value="#subtitle-w-overwrite-changes-dialog"]'
+            '[data-w-teleport-mode-value="textContent"]'
         )
         self.assertIsNotNone(dialog_subtitle)
         self.assertIn(
@@ -730,11 +915,15 @@ class TestPingView(WagtailTestUtils, TestCase):
         self.assertIn("You have unsaved changes in another window", session_text)
         self.assertNotIn("Currently viewing", session_text)
         dialog_title = soup.select_one(
-            'template[data-w-teleport-target-value="#title-text-w-overwrite-changes-dialog"]'
+            "template"
+            '[data-w-teleport-target-value="#title-text-w-overwrite-changes-dialog"]'
+            '[data-w-teleport-mode-value="textContent"]'
         )
         self.assertIsNone(dialog_title)
         dialog_subtitle = soup.select_one(
-            'template[data-w-teleport-target-value="#subtitle-w-overwrite-changes-dialog"]'
+            "template"
+            '[data-w-teleport-target-value="#subtitle-w-overwrite-changes-dialog"]'
+            '[data-w-teleport-mode-value="textContent"]'
         )
         self.assertIsNone(dialog_subtitle)
         other_session_text = rendered_sessions[1].text
@@ -937,6 +1126,32 @@ class TestPingView(WagtailTestUtils, TestCase):
             ],
         )
 
+        # The rendered HTML should use special messaging if the newer revision
+        # is made by the same user ("in another window").
+        soup = self.get_soup(response_json["html"])
+        rendered_sessions = soup.select("ol.w-editing-sessions__list li")
+        self.assertEqual(len(rendered_sessions), 2)
+        session_text = rendered_sessions[0].text
+        self.assertIn("You saved a new version in another window", session_text)
+        self.assertNotIn("Currently viewing", session_text)
+        dialog_title = soup.select_one(
+            'template[data-w-teleport-target-value="#title-text-w-overwrite-changes-dialog"]'
+        )
+        self.assertIsNotNone(dialog_title)
+        self.assertIn(
+            "You saved a new version in another window", dialog_title.text.strip()
+        )
+        dialog_subtitle = soup.select_one(
+            'template[data-w-teleport-target-value="#subtitle-w-overwrite-changes-dialog"]'
+        )
+        self.assertIsNotNone(dialog_subtitle)
+        self.assertIn(
+            "Proceeding will overwrite the changes you made in that window. "
+            "Refreshing the page will show you the new changes, but you will "
+            "lose any of your unsaved changes in the current window.",
+            dialog_subtitle.text.strip(),
+        )
+
     @freeze_time(TIMESTAMP_NOW)
     def test_user_must_have_edit_permission_on_page(self):
         # make user a member of Editors
@@ -1331,6 +1546,13 @@ class TestModuleInEditView(WagtailTestUtils, TestCase):
             revision_input.get("value"),
             str(self.object.latest_revision.id),
         )
+        revision_created_at = soup.select_one('input[name="revision_created_at"]')
+        self.assertIsNotNone(revision_created_at)
+        self.assertEqual(revision_created_at.get("type"), "hidden")
+        self.assertEqual(
+            revision_created_at.get("value"),
+            self.object.latest_revision.created_at.isoformat(),
+        )
 
     @freeze_time(TIMESTAMP_NOW)
     def test_edit_view_with_default_interval(self):