Merge pull request #63 from plone/pa-discussion-core-addon

prepare to work without pas.discussion installed.
plone · May 31, 2024 · 1f9bc0b · 1f9bc0b
2 parents 132f8c1 + f2b91fb
commit 1f9bc0b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/Products/CMFPlacefulWorkflow/tests/test_CMFPlacefulWorkflow.py b/Products/CMFPlacefulWorkflow/tests/test_CMFPlacefulWorkflow.py
@@ -674,20 +674,20 @@ def test_16_getWorklists(self):
         if "comment_review_workflow" in keys:
             # This test needs to work on both 4.0 and 4.1
             keys.remove("comment_review_workflow")
-
+        expected = (
+            "folder_workflow",
+            "intranet_folder_workflow",
+            "intranet_workflow",
+            "one_state_workflow",
+            "plone_workflow",
+            "simple_publication_workflow",
+        )
+        installer = get_installer(self.portal)
+        if installer.is_product_installed("plone.app.discussion"):
+            expected += ("comment_one_state_workflow",)
         self.assertEqual(
             sorted(tuple(keys)),
-            sorted(
-                (
-                    "comment_one_state_workflow",
-                    "folder_workflow",
-                    "intranet_folder_workflow",
-                    "intranet_workflow",
-                    "one_state_workflow",
-                    "plone_workflow",
-                    "simple_publication_workflow",
-                )
-            ),
+            sorted(expected),
         )
         self.assertEqual(tuple(wf_tool.getWorklistsResults()), (document,))
 

diff --git a/news/63.bugfix b/news/63.bugfix
@@ -0,0 +1 @@
+Prepare to work with plone.app.discussion as a core add-on. [@jensens]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Prepare to work with plone.app.discussion as a core add-on. [@jensens]