fix: tests

Author: fsbraun

djangocms_versioning/admin.py

@@ -1101,7 +1101,7 @@ def publish_view(self, request, object_id):
         # Redirect to published?
         if not requested_redirect and conf.ON_PUBLISH_REDIRECT == "published":
             if hasattr(version.content, "get_absolute_url"):
-                requested_redirect = get_object_live_url(version.content, site=get_current_site(request))
+                redirect_url = get_object_live_url(version.content, site=get_current_site(request)) or redirect_url
 
         return self._internal_redirect(requested_redirect, redirect_url)
 

djangocms_versioning/test_utils/polls/models.py

@@ -1,6 +1,7 @@
 from cms.models import CMSPlugin
 from django.db import models
 from django.urls import reverse
+from django.utils.translation import override
 
 
 class Poll(models.Model):
@@ -19,7 +20,8 @@ def __str__(self):
         return self.text
 
     def get_absolute_url(self):
-        return reverse("admin:polls_pollcontent_changelist")
+        with override(self.language):
+            return reverse("admin:polls_pollcontent_changelist")
 
     def get_preview_url(self):
         return reverse("admin:polls_pollcontent_preview", args=[self.id])

tests/test_handlers.py

@@ -46,7 +46,6 @@ def test_change_plugin(self):
         plugin = add_plugin(
             placeholder, "PollPlugin", version.content.language, poll=poll
         )
-        plugin.page.get_absolute_url = lambda *args, **kwargs: "/test_page/"  # Fake URL needed for URI
 
         dt = datetime(2016, 6, 6)
         with freeze_time(dt):

tests/test_menus.py

@@ -1,7 +1,7 @@
 from cms import constants as cms_constants
 from cms.test_utils.testcases import CMSTestCase
 from cms.toolbar.toolbar import CMSToolbar
-from cms.toolbar.utils import get_object_preview_url
+from cms.toolbar.utils import get_object_edit_url, get_object_preview_url
 from django.contrib.auth.models import AnonymousUser
 from django.template import Context, Template
 from django.test import RequestFactory
@@ -74,7 +74,7 @@ def _assert_node(self, node, version, edit_or_preview=True):
         self.assertEqual(node.title, content.title)
 
         if edit_or_preview:
-            self.assertEqual(node.url, get_object_preview_url(content))
+            self.assertIn(node.url, (get_object_preview_url(content), get_object_edit_url(content),))
         else:
             self.assertEqual(node.url, content.get_absolute_url())