Merge pull request #236 from plone/portal-in-the-catalog

Portal in the catalog
plone · Oct 30, 2021 · 7a1bd2b · 7a1bd2b
2 parents 7fde206 + 253c673
commit 7a1bd2b
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 3 deletions.
diff --git a/news/236.bugfix b/news/236.bugfix
@@ -0,0 +1 @@
+Adapt the tests to cope with the fact the since Plone 6 the Plone site root is cataloged [ale-rt]
diff --git a/plone/app/content/tests/test_folder.py b/plone/app/content/tests/test_folder.py
@@ -162,7 +162,7 @@ def testStateChange(self):
         effective_index = self.convertDateTimeToIndexRepr(
             self.portal.page.effective_date
         )
-        self.assertEqual(pc.uniqueValuesFor("effective"), (effective_index,))
+        self.assertIn(effective_index, pc.uniqueValuesFor("effective"))
 
 
 class RenameTest(BaseTest):

diff --git a/plone/app/content/tests/test_widgets.py b/plone/app/content/tests/test_widgets.py
@@ -122,7 +122,12 @@ def testVocabularyCatalogResults(self):
                     "i": "path",
                     "o": "plone.app.querystring.operation.string.path",
                     "v": "/plone",
-                }
+                },
+                {
+                    "i": "portal_type",
+                    "o": "plone.app.querystring.operation.selection.any",
+                    "v": "Document",
+                },
             ]
         }
         self.request.form.update(
@@ -216,7 +221,12 @@ def testVocabularyBatching(self):
                     "i": "path",
                     "o": "plone.app.querystring.operation.string.path",
                     "v": "/plone",
-                }
+                },
+                {
+                    "i": "portal_type",
+                    "o": "plone.app.querystring.operation.selection.any",
+                    "v": "Document",
+                },
             ]
         }
         # batch pages are 1-based
@@ -601,10 +611,20 @@ def testUntranslatableMetadata(self):
 
     def testGetMimeIcon(self):
         """Check if the returned icon is correct"""
+        query = {
+            "criteria": [
+                {
+                    "i": "portal_type",
+                    "o": "plone.app.querystring.operation.selection.any",
+                    "v": "File",
+                },
+            ]
+        }
         self.request.form.update(
             {
                 "name": "plone.app.vocabularies.Catalog",
                 "attributes": ["getMimeIcon"],
+                "query": json.dumps(query),
             }
         )
         view = VocabularyView(self.portal, self.request)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Adapt the tests to cope with the fact the since Plone 6 the Plone site root is cataloged [ale-rt]