✅ fix tests for versioning

Author: Coperh

changes/1234.feature

@@ -0,0 +1 @@
+fix toolbar page content

cms_helper.py

@@ -19,6 +19,7 @@ def gettext(s):
         "taggit",
         "taggit_autosuggest",
         "meta",
+        "djangocms_versioning",
         # "djangocms_page_tags",
         "tests.test_utils",
     ],

djangocms_page_meta/utils.py

@@ -1,3 +1,4 @@
+from cms.models import PageContent
 from django.template.loader import render_to_string
 from django.utils.safestring import mark_safe
 from django.utils.translation import get_language_from_request
@@ -39,7 +40,7 @@ def get_page_meta(page, language):
     meta = cache.get(meta_key)
     if not meta:
         meta = Meta()
-        title = page.get_content_obj(language)
+        title = PageContent.admin_manager.filter(page=page, language=language).current_content().get()
         default_meta_image = DefaultMetaImage.objects.first().image
         meta.extra_custom_props = []
 

tests/base.py

@@ -3,6 +3,7 @@
 
 from app_helper.base_test import CreateTestDataMixin
 from cms.api import create_page, create_page_content
+from cms.models import PageContent
 from cms.test_utils.testcases import CMSTestCase
 from django.contrib.auth.models import Permission
 from django.core.cache import cache
@@ -90,12 +91,14 @@ def create_pages(self):
 
             main_data = deepcopy(page_data[self.language])
             main_data["language"] = self.language
+            main_data["created_by"] = self.superuser
             page = create_page(**main_data)
 
             for lang in self.languages[1:]:
                 context_data = deepcopy(page_data[lang])
                 context_data["language"] = lang
                 context_data["page"] = page
+                context_data["created_by"] = self.superuser
                 create_page_content(**context_data)
 
             if not home_set:
@@ -118,3 +121,8 @@ def _add_default_permissions(self, user):
     def create_filer_image_object(self):
         self.filer_image = self.create_filer_image(self.staff_user, self.image_name)
         return self.filer_image
+
+    def publish_page(self, page, language):
+        content = PageContent.admin_manager.get(page=page, language=language)
+        version = content.versions.first()
+        version.publish(self.superuser)

tests/test_general.py

@@ -1,8 +1,10 @@
+from cms.models import PageContent
 from django.conf import settings
 from django.core.cache import cache
 from django.template.base import Parser
 from django.test import override_settings
 from django.utils.functional import SimpleLazyObject
+from djangocms_versioning.constants import INDICATOR_DESCRIPTIONS
 
 from djangocms_page_meta import models
 from djangocms_page_meta.forms import PageMetaAdminForm, TitleMetaAdminForm
@@ -182,7 +184,8 @@ def test_custom_extra(self):
         page1 = self.create_pages()[0]
         page_meta = models.PageMeta.objects.create(extended_object=page1)
         page_meta.save()
-        title_meta = models.TitleMeta.objects.create(extended_object=page1.get_content_obj("en"))
+        content = PageContent.admin_manager.get(page=page1, language="en")
+        title_meta = models.TitleMeta.objects.create(extended_object=content)
         title_meta.save()
 
         models.GenericMetaAttribute.objects.create(page=page_meta, attribute="custom", name="attr", value="foo")
@@ -196,37 +199,41 @@ def test_custom_extra(self):
         meta = get_page_meta(page1, "it")
         self.assertEqual(meta.extra_custom_props, [("custom", "attr", "foo")])
 
-    # def test_publish_extra(self):
-    #     """
-    #     Test that modified GenericMetaAttribute are not copied multiple times on page publish
-    #     See issue #78
-    #     """
-    #     page1 = self.create_pages()[0]
-    #     page_meta = models.PageMeta.objects.create(extended_object=page1)
-    #     title_meta = models.TitleMeta.objects.create(extended_object=page1.get_content_obj("en"))
-    #     models.GenericMetaAttribute.objects.create(page=page_meta, attribute="custom", name="attr", value="foo")
-    #     models.GenericMetaAttribute.objects.create(title=title_meta, attribute="custom", name="attr", value="bar")
-    #
-    #     page1.publish("en")
-    #     page_meta.extra.first().attribute = "new"
-    #     page_meta.extra.first().save()
-    #     title_meta.extra.first().attribute = "new"
-    #     title_meta.extra.first().save()
-    #
-    #     page1.publish("en")
-    #     public = page1.get_public_object()
-    #     page_meta = models.PageMeta.objects.get(extended_object=public)
-    #     title_meta = models.TitleMeta.objects.get(extended_object=public.get_content_obj("en"))
-    #     self.assertEqual(page_meta.extra.count(), 1)
-    #     self.assertEqual(title_meta.extra.count(), 1)
+    def test_publish_extra(self):
+        """
+        Test that modified GenericMetaAttribute are not copied multiple times on page publish
+        See issue #78
+        """
+        page1 = self.create_pages()[0]
+        page_meta = models.PageMeta.objects.create(extended_object=page1)
+        content = PageContent.admin_manager.get(page=page1, language="en")
+        title_meta = models.TitleMeta.objects.create(extended_object=content)
+        models.GenericMetaAttribute.objects.create(page=page_meta, attribute="custom", name="attr", value="foo")
+        models.GenericMetaAttribute.objects.create(title=title_meta, attribute="custom", name="attr", value="bar")
+
+        version = content.versions.first()
+        version.publish(self.superuser)
+        page_meta.extra.first().attribute = "new"
+        page_meta.extra.first().save()
+        title_meta.extra.first().attribute = "new"
+        title_meta.extra.first().save()
+
+        new_version = version.copy(self.superuser)
+        new_version.publish(self.superuser)
+        public = page1  # page no longer versioned
+        page_meta = models.PageMeta.objects.get(extended_object=public)
+        title_meta = models.TitleMeta.objects.get(extended_object=public.get_content_obj("en"))
+        self.assertEqual(page_meta.extra.count(), 1)
+        self.assertEqual(title_meta.extra.count(), 1)
 
     def test_str_methods(self):
         """
         Models str are created
         """
         page1 = self.create_pages()[0]
         page_meta = models.PageMeta.objects.create(extended_object=page1)
-        title_meta = models.TitleMeta.objects.create(extended_object=page1.get_content_obj("en"))
+        content = PageContent.admin_manager.get(page=page1, language="en")
+        title_meta = models.TitleMeta.objects.create(extended_object=content)
         default_meta_image = models.DefaultMetaImage.objects.first()
         page_attr = models.GenericMetaAttribute.objects.create(
             page=page_meta, attribute="custom", name="attr", value="foo"
@@ -236,7 +243,7 @@ def test_str_methods(self):
         )
 
         self.assertEqual(str(page_meta), f"Page Meta for {page1}")
-        self.assertEqual(str(title_meta), f"Title Meta for {page1.get_content_obj('en')}")
+        self.assertEqual(str(title_meta), f"Page Content Meta for {content}: {INDICATOR_DESCRIPTIONS['draft']}")
         self.assertEqual(str(default_meta_image), f"{default_meta_image.pk}")
         self.assertEqual(str(page_attr), f"Attribute {page_attr.name} for {page_meta}")
         self.assertEqual(str(title_attr), f"Attribute {title_attr.name} for {title_meta}")
@@ -258,7 +265,8 @@ def test_cache_cleanup_on_update_delete_meta(self):
         """
         page1 = self.create_pages()[0]
         page_meta = models.PageMeta.objects.create(extended_object=page1)
-        title_meta = models.TitleMeta.objects.create(extended_object=page1.get_content_obj("en"))
+        content = PageContent.admin_manager.get(page=page1, language="en")
+        title_meta = models.TitleMeta.objects.create(extended_object=content)
 
         # cache objects
         for language in page1.get_languages():
@@ -299,7 +307,8 @@ def test_cache_cleanup_on_update_delete_page(self):
         """
         page1 = self.create_pages()[0]
         page_meta = models.PageMeta.objects.create(extended_object=page1)
-        title_meta = models.TitleMeta.objects.create(extended_object=page1.get_content_obj("en"))
+        content = PageContent.admin_manager.get(page=page1, language="en")
+        title_meta = models.TitleMeta.objects.create(extended_object=content)
 
         # cache objects - cache keys must be pre calculated as the page will not exist anymore when running the
         # asserts

tests/test_templatetags.py

@@ -1,3 +1,5 @@
+from cms.models import PageContent
+
 from djangocms_page_meta.models import GenericMetaAttribute, PageMeta, TitleMeta
 
 from .base import BaseTest
@@ -17,8 +19,8 @@ def test_page_meta(self):
         GenericMetaAttribute.objects.create(page=page_ext, attribute="custom", name="attr", value="foo")
         # page1.publication_end_date = page1.publication_date + timedelta(days=1)
         page1.save()
-        # page1.publish("it")
-        # page1.publish("en")
+        self.publish_page(page1, "it")
+        self.publish_page(page1, "en")
 
         response = self.client.get(page1.get_absolute_url("en"))
         self.assertContains(response, '<meta name="twitter:domain" content="example.com">')
@@ -39,7 +41,7 @@ def test_page_meta_robots_no_data(self):
         page_ext = PageMeta.objects.create(extended_object=page1)
         page_ext.save()
         page1.save()
-        # page1.publish("en")
+        self.publish_page(page1, "en")
         response = self.client.get(page1.get_absolute_url("en"))
         self.assertNotContains(response, '<meta name="robots"')
 
@@ -53,7 +55,7 @@ def test_page_meta_robots_single(self):
             setattr(page_ext, key, val)
         page_ext.save()
         page1.save()
-        # page1.publish("en")
+        self.publish_page(page1, "en")
         response = self.client.get(page1.get_absolute_url("en"))
         self.assertContains(response, '<meta name="robots" content="noindex">')
 
@@ -67,7 +69,7 @@ def test_page_meta_robots_multiple(self):
             setattr(page_ext, key, val)
         page_ext.save()
         page1.save()
-        # page1.publish("en")
+        self.publish_page(page1, "en")
         response = self.client.get(page1.get_absolute_url("en"))
         self.assertContains(response, '<meta name="robots" content="none, noimageindex, noarchive">')
 
@@ -76,20 +78,20 @@ def test_title_meta(self):
         Test title-level templatetags
         """
         page1 = self.create_pages()[0]
-        title_en = page1.get_content_obj(language="en", fallback=False)
-        title_it = page1.get_content_obj(language="it", fallback=False)
-        title_ext = TitleMeta.objects.create(extended_object=title_en)
+        content_en = PageContent.admin_manager.get(page=page1, language="en")
+        content_it = PageContent.admin_manager.get(page=page1, language="it")
+        title_ext = TitleMeta.objects.create(extended_object=content_en)
         for key, val in self.title_data.items():
             setattr(title_ext, key, val)
         title_ext.save()
         GenericMetaAttribute.objects.create(title=title_ext, attribute="custom", name="attr", value="foo-en")
-        title_ext = TitleMeta.objects.create(extended_object=title_it)
+        title_ext = TitleMeta.objects.create(extended_object=content_it)
         for key, val in self.title_data_it.items():
             setattr(title_ext, key, val)
         title_ext.save()
         GenericMetaAttribute.objects.create(title=title_ext, attribute="custom", name="attr", value="foo-it")
-        # page1.publish("it")
-        # page1.publish("en")
+        self.publish_page(page1, "it")
+        self.publish_page(page1, "en")
 
         # Italian language
         response = self.client.get(page1.get_absolute_url("it"))
@@ -119,18 +121,18 @@ def test_fallbacks(self):
         Test title-level templatetags
         """
         page1, page2 = self.create_pages()
-        content_en = page1.get_content_obj(language="en", fallback=False)
+        content_en = PageContent.admin_manager.get(page=page1, language="en")
         content_en.meta_description = self.title_data["description"]
         content_en.save()
-        content_it = page1.get_content_obj(language="it", fallback=False)
+        content_it = PageContent.admin_manager.get(page=page1, language="it")
         content_it.meta_description = self.title_data_it["description"]
         content_it.save()
         content_ext_en = TitleMeta.objects.create(extended_object=content_en)
         content_ext_en.save()
         content_ext_it = TitleMeta.objects.create(extended_object=content_it)
         content_ext_it.save()
-        # page1.publish("it")
-        # page1.publish("en")
+        self.publish_page(page1, "it")
+        self.publish_page(page1, "en")
 
         # page1 = page1.get_draft_object()
         content_en = page1.get_content_obj(language="en", fallback=False)
@@ -179,10 +181,10 @@ def test_fallbacks(self):
         self.assertContains(response, '<meta name="twitter:description" content="twitter custom description">')
         self.assertContains(response, '<meta property="og:description" content="og custom description">')
 
-        title2_en = page2.get_content_obj(language="en", fallback=False)
-        title2_en.meta_description = self.title_data["description"]
-        title2_en.save()
-        # page2.publish("en")
+        content2_en = PageContent.admin_manager.get(page=page2, language="en")
+        content2_en.meta_description = self.title_data["description"]
+        content2_en.save()
+        self.publish_page(page2, "en")
         # English language
         # A page with no title meta, and yet the meta description is there
         response = self.client.get(page2.get_absolute_url("en"))

tests/test_toolbar.py

@@ -1,3 +1,4 @@
+from cms.models import PageContent
 from cms.toolbar.items import Menu, ModalItem, SubMenu
 from cms.utils.i18n import get_language_object
 from django.test.utils import override_settings
@@ -148,7 +149,8 @@ def test_toolbar_with_items(self):
 
         page1 = self.create_pages()[0]
         page_ext = PageMeta.objects.create(extended_object=page1)
-        title_meta = TitleMeta.objects.create(extended_object=page1.get_content_obj("en"))
+        content = PageContent.admin_manager.get(page=page1, language="en")
+        title_meta = TitleMeta.objects.create(extended_object=content)
         default_meta_image = DefaultMetaImage.objects.first()
         request = self.get_page_request(page1, self.staff_user)
         toolbar = CMSToolbar(request)
@@ -173,7 +175,7 @@ def test_toolbar_with_items(self):
         )
         url_change = False
         url_add = False
-        for title in page1.pagecontent_set.all():
+        for title in PageContent.admin_manager.filter(page=page1):
             language = get_language_object(title.language)
             titlemeta_menu = meta_menu.find_items(ModalItem, name="{}...".format(language["name"]))
             self.assertEqual(len(titlemeta_menu), 1)