Fix added and improved the versioning tests

Author: Aiky30

CHANGELOG.rst

@@ -2,6 +2,12 @@
 Changelog
 =========
 
+Unreleased
+==================
+* fix: Error when rendering a Draft Snippet plugin on a Published page
+* feat: djangocms-versioning support added, including model restructure and configuration
+* feat: django-cms v4.0.x support added
+
 
 3.0.0 (2020-09-02)
 ==================

djangocms_snippet/cms_plugins.py

@@ -24,6 +24,11 @@ class SnippetPlugin(CMSPluginBase):
 
     def render(self, context, instance, placeholder):
         snippet = instance.snippet_grouper.snippet(show_editable=show_draft_content(context["request"]))
+
+        # Handle the potential for no snippet to be found i.e. Draft
+        if not snippet:
+            return context
+
         try:
             if snippet.template:
                 context = context.flatten()

tests/test_plugins.py

@@ -196,6 +196,7 @@ def test_correct_versioning_state_published_snippet_and_page(self):
             response = self.client.get(request_url)
 
         self.assertContains(response, "<p>live content</p>")
+        self.assertNotIn("draft content", str(response.content))
 
     def test_correct_versioning_state_draft_snippet_and_page(self):
         """
@@ -222,6 +223,7 @@ def test_correct_versioning_state_draft_snippet_and_page(self):
             response = self.client.get(request_url)
 
         self.assertContains(response, "<p>draft content</p>")
+        self.assertNotIn("live content", str(response.content))
 
     def test_draft_snippet_and_page_live_url_rendering(self):
         """
@@ -252,7 +254,9 @@ def test_draft_snippet_and_page_live_url_rendering(self):
         with self.login_user_context(self.superuser):
             response = self.client.get(request_url)
 
-        self.assertContains(response, "<p>Draft snippet</p>")
+        self.assertEqual(response.status_code, 200)
+        self.assertNotIn("Draft snippet", str(response.content))
+        self.assertNotIn("Published snippet", str(response.content))
 
     def test_published_snippet_and_page_live_url_rendering(self):
         """
@@ -285,3 +289,4 @@ def test_published_snippet_and_page_live_url_rendering(self):
             response = self.client.get(request_url)
 
         self.assertContains(response, "<p>Published snippet</p>")
+        self.assertNotIn("Draft snippet", str(response.content))