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

wagtail/contrib/redirects/templates/wagtailredirects/confirm_delete.html

@@ -1,16 +1,6 @@
-{% extends "wagtailadmin/base.html" %}
+{% extends "wagtailadmin/generic/confirm_delete.html" %}
 {% load i18n %}
 {% block titletag %}{% blocktrans trimmed with title=redirect.title %}Delete redirect {{ title }}{% endblocktrans %}{% endblock %}
-{% block content %}
-    {% trans "Delete" as delete_str %}
-    {% include "wagtailadmin/shared/header.html" with title=delete_str subtitle=redirect.title icon="redirect" %}
-
-    <div class="row row-flush nice-padding">
-        <p>{% trans "Are you sure you want to delete this redirect?" %}</p>
-        <form action="{% url 'wagtailredirects:delete' redirect.id %}" method="POST">
-            {% csrf_token %}
-            <input type="submit" value="{% trans 'Yes, delete' %}" class="button serious" />
-        </form>
-    </div>
-
+{% block confirmation_message %}
+    <p>{% trans "Are you sure you want to delete this redirect?" %}</p>
 {% endblock %}

wagtail/contrib/redirects/tests/test_redirects.py

@@ -801,14 +801,15 @@ class TestRedirectsAddView(WagtailTestUtils, TestCase):
         self.assertTemplateUsed(response, "wagtailredirects/add.html")
 
     def test_add(self):
-        response = self.post(
-            {
-                "old_path": "/test",
-                "site": "",
-                "is_permanent": "on",
-                "redirect_link": "http://www.test.com/",
-            }
-        )
+        with self.captureOnCommitCallbacks(execute=True):
+            response = self.post(
+                {
+                    "old_path": "/test",
+                    "site": "",
+                    "is_permanent": "on",
+                    "redirect_link": "http://www.test.com/",
+                }
+            )
 
         # Should redirect back to index
         self.assertRedirects(response, reverse("wagtailredirects:index"))
@@ -827,15 +828,16 @@ class TestRedirectsAddView(WagtailTestUtils, TestCase):
         self.assertEqual(PURGED_URLS, {"http://localhost/test"})
 
     def test_add_with_site(self):
-        localhost = Site.objects.get(hostname="localhost")
-        response = self.post(
-            {
-                "old_path": "/test",
-                "site": localhost.id,
-                "is_permanent": "on",
-                "redirect_link": "http://www.test.com/",
-            }
-        )
+        with self.captureOnCommitCallbacks(execute=True):
+            localhost = Site.objects.get(hostname="localhost")
+            response = self.post(
+                {
+                    "old_path": "/test",
+                    "site": localhost.id,
+                    "is_permanent": "on",
+                    "redirect_link": "http://www.test.com/",
+                }
+            )
 
         # Should redirect back to index
         self.assertRedirects(response, reverse("wagtailredirects:index"))
@@ -849,72 +851,76 @@ class TestRedirectsAddView(WagtailTestUtils, TestCase):
         self.assertEqual(PURGED_URLS, {"http://localhost/test"})
 
     def test_add_validation_error(self):
-        response = self.post(
-            {
-                "old_path": "",
-                "site": "",
-                "is_permanent": "on",
-                "redirect_link": "http://www.test.com/",
-            }
-        )
+        with self.captureOnCommitCallbacks(execute=True):
+            response = self.post(
+                {
+                    "old_path": "",
+                    "site": "",
+                    "is_permanent": "on",
+                    "redirect_link": "http://www.test.com/",
+                }
+            )
 
         # Should not redirect to index
         self.assertEqual(response.status_code, 200)
         self.assertEqual(PURGED_URLS, set())
 
     def test_cannot_add_duplicate_with_no_site(self):
-        models.Redirect.objects.create(
-            old_path="/test", site=None, redirect_link="http://elsewhere.com/"
-        )
-        response = self.post(
-            {
-                "old_path": "/test",
-                "site": "",
-                "is_permanent": "on",
-                "redirect_link": "http://www.test.com/",
-            }
-        )
+        with self.captureOnCommitCallbacks(execute=True):
+            models.Redirect.objects.create(
+                old_path="/test", site=None, redirect_link="http://elsewhere.com/"
+            )
+            response = self.post(
+                {
+                    "old_path": "/test",
+                    "site": "",
+                    "is_permanent": "on",
+                    "redirect_link": "http://www.test.com/",
+                }
+            )
 
         # Should not redirect to index
         self.assertEqual(response.status_code, 200)
         self.assertEqual(PURGED_URLS, set())
 
     def test_cannot_add_duplicate_on_same_site(self):
-        localhost = Site.objects.get(hostname="localhost")
-        models.Redirect.objects.create(
-            old_path="/test", site=localhost, redirect_link="http://elsewhere.com/"
-        )
-        response = self.post(
-            {
-                "old_path": "/test",
-                "site": localhost.pk,
-                "is_permanent": "on",
-                "redirect_link": "http://www.test.com/",
-            }
-        )
+        with self.captureOnCommitCallbacks(execute=True):
+            localhost = Site.objects.get(hostname="localhost")
+            models.Redirect.objects.create(
+                old_path="/test", site=localhost, redirect_link="http://elsewhere.com/"
+            )
+            response = self.post(
+                {
+                    "old_path": "/test",
+                    "site": localhost.pk,
+                    "is_permanent": "on",
+                    "redirect_link": "http://www.test.com/",
+                }
+            )
 
         # Should not redirect to index
         self.assertEqual(response.status_code, 200)
         self.assertEqual(PURGED_URLS, set())
 
     def test_can_reuse_path_on_other_site(self):
-        localhost = Site.objects.get(hostname="localhost")
-        contact_page = Page.objects.get(url_path="/home/contact-us/")
-        other_site = Site.objects.create(
-            hostname="other.example.com", port=80, root_page=contact_page
-        )
+        with self.captureOnCommitCallbacks(execute=True):
+            localhost = Site.objects.get(hostname="localhost")
+            contact_page = Page.objects.get(url_path="/home/contact-us/")
+            other_site = Site.objects.create(
+                hostname="other.example.com", port=80, root_page=contact_page
+            )
 
-        models.Redirect.objects.create(
-            old_path="/test", site=localhost, redirect_link="http://elsewhere.com/"
-        )
-        response = self.post(
-            {
-                "old_path": "/test",
-                "site": other_site.pk,
-                "is_permanent": "on",
-                "redirect_link": "http://www.test.com/",
-            }
-        )
+            models.Redirect.objects.create(
+                old_path="/test", site=localhost, redirect_link="http://elsewhere.com/"
+            )
+            response = self.post(
+                {
+                    "old_path": "/test",
+                    "site": other_site.pk,
+                    "is_permanent": "on",
+                    "redirect_link": "http://www.test.com/",
+                }
+            )
 
         # Should redirect back to index
         self.assertRedirects(response, reverse("wagtailredirects:index"))
@@ -926,14 +932,15 @@ class TestRedirectsAddView(WagtailTestUtils, TestCase):
         self.assertEqual(PURGED_URLS, redirects.get().old_links())
 
     def test_add_long_redirect(self):
-        response = self.post(
-            {
-                "old_path": "/test",
-                "site": "",
-                "is_permanent": "on",
-                "redirect_link": "https://www.google.com/search?q=this+is+a+very+long+url+because+it+has+a+huge+search+term+appended+to+the+end+of+it+even+though+someone+should+really+not+be+doing+something+so+crazy+without+first+seeing+a+psychiatrist",
-            }
-        )
+        with self.captureOnCommitCallbacks(execute=True):
+            response = self.post(
+                {
+                    "old_path": "/test",
+                    "site": "",
+                    "is_permanent": "on",
+                    "redirect_link": "https://www.google.com/search?q=this+is+a+very+long+url+because+it+has+a+huge+search+term+appended+to+the+end+of+it+even+though+someone+should+really+not+be+doing+something+so+crazy+without+first+seeing+a+psychiatrist",
+                }
+            )
 
         # Should redirect back to index
         self.assertRedirects(response, reverse("wagtailredirects:index"))
@@ -1002,14 +1009,15 @@ class TestRedirectsEditView(AdminTemplateTestUtils, WagtailTestUtils, TestCase):
         self.assertEqual(self.get(redirect_id=100000).status_code, 404)
 
     def test_edit(self):
-        response = self.post(
-            {
-                "old_path": "/test",
-                "is_permanent": "on",
-                "site": "",
-                "redirect_link": "http://www.test.com/ive-been-edited",
-            }
-        )
+        with self.captureOnCommitCallbacks(execute=True):
+            response = self.post(
+                {
+                    "old_path": "/test",
+                    "is_permanent": "on",
+                    "site": "",
+                    "redirect_link": "http://www.test.com/ive-been-edited",
+                }
+            )
 
         # Should redirect back to index
         self.assertRedirects(response, reverse("wagtailredirects:index"))
@@ -1025,16 +1033,17 @@ class TestRedirectsEditView(AdminTemplateTestUtils, WagtailTestUtils, TestCase):
         self.assertEqual(PURGED_URLS, {"http://localhost/test"})
 
     def test_edit_with_site(self):
-        localhost = Site.objects.get(hostname="localhost")
-
-        response = self.post(
-            {
-                "old_path": "/test",
-                "is_permanent": "on",
-                "site": localhost.id,
-                "redirect_link": "http://www.test.com/ive-been-edited",
-            }
-        )
+        with self.captureOnCommitCallbacks(execute=True):
+            localhost = Site.objects.get(hostname="localhost")
+
+            response = self.post(
+                {
+                    "old_path": "/test",
+                    "is_permanent": "on",
+                    "site": localhost.id,
+                    "redirect_link": "http://www.test.com/ive-been-edited",
+                }
+            )
 
         # Should redirect back to index
         self.assertRedirects(response, reverse("wagtailredirects:index"))
@@ -1049,31 +1058,33 @@ class TestRedirectsEditView(AdminTemplateTestUtils, WagtailTestUtils, TestCase):
         self.assertEqual(PURGED_URLS, {"http://localhost/test"})
 
     def test_edit_validation_error(self):
-        response = self.post(
-            {
-                "old_path": "",
-                "is_permanent": "on",
-                "site": "",
-                "redirect_link": "http://www.test.com/ive-been-edited",
-            }
-        )
+        with self.captureOnCommitCallbacks(execute=True):
+            response = self.post(
+                {
+                    "old_path": "",
+                    "is_permanent": "on",
+                    "site": "",
+                    "redirect_link": "http://www.test.com/ive-been-edited",
+                }
+            )
 
         # Should not redirect to index
         self.assertEqual(response.status_code, 200)
         self.assertEqual(PURGED_URLS, set())
 
     def test_edit_duplicate(self):
-        models.Redirect.objects.create(
-            old_path="/othertest", site=None, redirect_link="http://elsewhere.com/"
-        )
-        response = self.post(
-            {
-                "old_path": "/othertest",
-                "is_permanent": "on",
-                "site": "",
-                "redirect_link": "http://www.test.com/ive-been-edited",
-            }
-        )
+        with self.captureOnCommitCallbacks(execute=True):
+            models.Redirect.objects.create(
+                old_path="/othertest", site=None, redirect_link="http://elsewhere.com/"
+            )
+            response = self.post(
+                {
+                    "old_path": "/othertest",
+                    "is_permanent": "on",
+                    "site": "",
+                    "redirect_link": "http://www.test.com/ive-been-edited",
+                }
+            )
 
         # Should not redirect to index
         self.assertEqual(response.status_code, 200)
@@ -1153,7 +1164,8 @@ class TestRedirectsDeleteView(WagtailTestUtils, TestCase):
         self.assertEqual(self.get(redirect_id=100000).status_code, 404)
 
     def test_delete(self):
-        response = self.post()
+        with self.captureOnCommitCallbacks(execute=True):
+            response = self.post()
 
         # Should redirect back to index
         self.assertRedirects(response, reverse("wagtailredirects:index"))

wagtail/contrib/redirects/tests/test_signal_handlers.py

@@ -41,28 +41,29 @@ class TestAutocreateRedirects(WagtailTestUtils, TestCase):
             page.save(log_action="wagtail.publish", user=self.user, clean=False)
 
     def test_golden_path(self):
-        # the page we'll be triggering the change for here is...
-        test_subject = self.event_index
-
-        # identify 'draft' pages in this section
-        drafts = test_subject.get_descendants().not_live()
-        self.assertEqual(len(drafts), 4)
-
-        # gather urls for 'live' pages in this branch
-        request = get_dummy_request()
-        branch_urls = []
-        for page in (
-            test_subject.get_descendants(inclusive=True)
-            .live()
-            .specific(defer=True)
-            .iterator()
-        ):
-            main_url = page.get_url(request).rstrip("/")
-            branch_urls.extend(
-                main_url + path.rstrip("/") for path in page.get_cached_paths()
-            )
-
-        self.trigger_page_slug_changed_signal(test_subject)
+        with self.captureOnCommitCallbacks(execute=True):
+            # the page we'll be triggering the change for here is...
+            test_subject = self.event_index
+
+            # identify 'draft' pages in this section
+            drafts = test_subject.get_descendants().not_live()
+            self.assertEqual(len(drafts), 4)
+
+            # gather urls for 'live' pages in this branch
+            request = get_dummy_request()
+            branch_urls = []
+            for page in (
+                test_subject.get_descendants(inclusive=True)
+                .live()
+                .specific(defer=True)
+                .iterator()
+            ):
+                main_url = page.get_url(request).rstrip("/")
+                branch_urls.extend(
+                    main_url + path.rstrip("/") for path in page.get_cached_paths()
+                )
+
+            self.trigger_page_slug_changed_signal(test_subject)
 
         # gather all of the redirects that were created
         redirects = Redirect.objects.all()
@@ -97,32 +98,34 @@ class TestAutocreateRedirects(WagtailTestUtils, TestCase):
         )
 
     def test_no_redirects_created_when_page_is_root_for_all_sites_it_belongs_to(self):
-        self.trigger_page_slug_changed_signal(self.home_page)
+        with self.captureOnCommitCallbacks(execute=True):
+            self.trigger_page_slug_changed_signal(self.home_page)
         self.assertFalse(Redirect.objects.exists())
         self.assertEqual(len(PURGED_URLS), 0)
 
     def test_handling_of_existing_redirects(self):
-        # the page we'll be triggering the change for here is...
-        test_subject = self.event_index
-
-        descendants = test_subject.get_descendants().live()
-
-        # but before we do, let's add some redirects that we'll expect to conflict
-        # with ones created by the signal handler
-        redirect1 = Redirect.objects.create(
-            old_path=Redirect.normalise_path(descendants.first().specific.url),
-            site=self.site,
-            redirect_link="/some-place",
-            automatically_created=False,
-        )
-        redirect2 = Redirect.objects.create(
-            old_path=Redirect.normalise_path(descendants.last().specific.url),
-            site=self.site,
-            redirect_link="/some-other-place",
-            automatically_created=True,
-        )
+        with self.captureOnCommitCallbacks(execute=True):
+            # the page we'll be triggering the change for here is...
+            test_subject = self.event_index
+
+            descendants = test_subject.get_descendants().live()
+
+            # but before we do, let's add some redirects that we'll expect to conflict
+            # with ones created by the signal handler
+            redirect1 = Redirect.objects.create(
+                old_path=Redirect.normalise_path(descendants.first().specific.url),
+                site=self.site,
+                redirect_link="/some-place",
+                automatically_created=False,
+            )
+            redirect2 = Redirect.objects.create(
+                old_path=Redirect.normalise_path(descendants.last().specific.url),
+                site=self.site,
+                redirect_link="/some-other-place",
+                automatically_created=True,
+            )
 
-        self.trigger_page_slug_changed_signal(test_subject)
+            self.trigger_page_slug_changed_signal(test_subject)
 
         # pre-existing manually-created redirects should be preserved
         from_db = Redirect.objects.get(id=redirect1.id)
@@ -163,17 +166,18 @@ class TestAutocreateRedirects(WagtailTestUtils, TestCase):
         )
 
     def test_redirect_creation_for_custom_route_paths(self):
-        # Add a page that has overridden get_route_paths()
-        homepage = Page.objects.get(id=2)
-        routable_page = homepage.add_child(
-            instance=RoutablePageTest(
-                title="Routable Page",
-                live=True,
+        with self.captureOnCommitCallbacks(execute=True):
+            # Add a page that has overridden get_route_paths()
+            homepage = Page.objects.get(id=2)
+            routable_page = homepage.add_child(
+                instance=RoutablePageTest(
+                    title="Routable Page",
+                    live=True,
+                )
             )
-        )
 
-        # Move from below the homepage to below the event index
-        routable_page.move(self.event_index, pos="last-child")
+            # Move from below the homepage to below the event index
+            routable_page.move(self.event_index, pos="last-child")
 
         # Redirects should have been created for each path returned by get_route_paths()
         self.assertEqual(
@@ -206,23 +210,24 @@ class TestAutocreateRedirects(WagtailTestUtils, TestCase):
         )
 
     def test_no_redirects_created_when_pages_are_moved_to_a_different_site(self):
-        # Add a new home page
-        homepage_2 = Page(
-            title="Second home",
-            slug="second-home",
-        )
-        root_page = Page.objects.get(depth=1)
-        root_page.add_child(instance=homepage_2)
-
-        # Create a site with the above as the root_page
-        Site.objects.create(
-            root_page=homepage_2,
-            hostname="newsite.com",
-            port=80,
-        )
+        with self.captureOnCommitCallbacks(execute=True):
+            # Add a new home page
+            homepage_2 = Page(
+                title="Second home",
+                slug="second-home",
+            )
+            root_page = Page.objects.get(depth=1)
+            root_page.add_child(instance=homepage_2)
+
+            # Create a site with the above as the root_page
+            Site.objects.create(
+                root_page=homepage_2,
+                hostname="newsite.com",
+                port=80,
+            )
 
-        # Move the event index to the new site
-        self.event_index.move(homepage_2, pos="last-child")
+            # Move the event index to the new site
+            self.event_index.move(homepage_2, pos="last-child")
 
         # No redirects should have been created
         self.assertFalse(Redirect.objects.exists())
@@ -230,6 +235,7 @@ class TestAutocreateRedirects(WagtailTestUtils, TestCase):
 
     @override_settings(WAGTAILREDIRECTS_AUTO_CREATE=False)
     def test_no_redirects_created_if_disabled(self):
-        self.trigger_page_slug_changed_signal(self.event_index)
+        with self.captureOnCommitCallbacks(execute=True):
+            self.trigger_page_slug_changed_signal(self.event_index)
         self.assertFalse(Redirect.objects.exists())
         self.assertEqual(len(PURGED_URLS), 0)

wagtail/contrib/redirects/urls.py

@@ -6,9 +6,9 @@ app_name = "wagtailredirects"
 urlpatterns = [
     path("", views.IndexView.as_view(), name="index"),
     path("results/", views.IndexView.as_view(results_only=True), name="index_results"),
-    path("add/", views.add, name="add"),
+    path("add/", views.CreateView.as_view(), name="add"),
     path("<int:redirect_id>/", views.EditView.as_view(), name="edit"),
-    path("<int:redirect_id>/delete/", views.delete, name="delete"),
+    path("<int:redirect_id>/delete/", views.DeleteView.as_view(), name="delete"),
     path("import/", views.start_import, name="start_import"),
     path("import/process/", views.process_import, name="process_import"),
 ]