Adapt the tests for Plone 6

news/1251.bugfix

@@ -0,0 +1 @@
+Adapt the test to cope with the fact the since Plone 6 the Plone site root is cataloged [ale-rt]

src/plone/restapi/tests/test_blocks_searchable_text.py

@@ -97,7 +97,11 @@ def test_search_text(self):
         self.assertEqual(json_response["items_total"], 1)
         self.assertEqual(json_response["items"][0]["Title"], "A document")
 
-        query = {"SearchableText": "Plone", "metadata_fields": "Title"}
+        query = {
+            "SearchableText": "Plone",
+            "metadata_fields": "Title",
+            "portal_type": "Document",
+        }
         response = self.api_session.get("/@search", params=query)
         json_response = response.json()
         self.assertEqual(json_response["items_total"], 1)
@@ -184,18 +188,30 @@ def test_index_searchableText_value(self):
 
         self.assertEqual(response.status_code, 204)
 
-        query = {"SearchableText": "Volto", "metadata_fields": "Title"}
+        query = {
+            "SearchableText": "Volto",
+            "metadata_fields": "Title",
+            "portal_type": "Document",
+        }
         response = self.api_session.get("/@search", params=query)
         json_response = response.json()
         self.assertEqual(json_response["items_total"], 0)
 
-        query = {"SearchableText": "Plone", "metadata_fields": "Title"}
+        query = {
+            "SearchableText": "Plone",
+            "metadata_fields": "Title",
+            "portal_type": "Document",
+        }
         response = self.api_session.get("/@search", params=query)
         json_response = response.json()
         self.assertEqual(json_response["items_total"], 1)
         self.assertEqual(json_response["items"][0]["Title"], "A document")
 
-        query = {"SearchableText": "custom", "metadata_fields": "Title"}
+        query = {
+            "SearchableText": "custom",
+            "metadata_fields": "Title",
+            "portal_type": "Document",
+        }
         response = self.api_session.get("/@search", params=query)
         json_response = response.json()
         self.assertEqual(json_response["items_total"], 1)

src/plone/restapi/tests/test_search.py

@@ -1,5 +1,7 @@
 from datetime import date
 from DateTime import DateTime
+from pkg_resources import get_distribution
+from pkg_resources import parse_version
 from plone import api
 from plone.app.discussion.interfaces import IDiscussionSettings
 from plone.app.layout.navigation.interfaces import INavigationRoot
@@ -21,6 +23,13 @@
 import unittest
 
 
+HAS_PLONE_6 = parse_version(
+    get_distribution("Products.CMFPlone").version
+) >= parse_version(
+    "6.0.0a1"
+)
+
+
 class TestSearchFunctional(unittest.TestCase):
 
     layer = PLONE_RESTAPI_DX_FUNCTIONAL_TESTING
@@ -620,7 +629,12 @@ def test_uuid_index_query(self):
     def test_respect_access_inactive_permission(self):
         # admin can see everything
         response = self.api_session.get("/@search", params={}).json()
-        self.assertEqual(response["items_total"], 6)
+        if HAS_PLONE_6:
+            # Since Plone 6 the Plone site is indexed ...
+            self.assertEqual(response["items_total"], 7)
+        else:
+            # ... before it was not
+            self.assertEqual(response["items_total"], 6)
         response = self.api_session.get(
             "/@search", params={"Title": "Lorem Ipsum"}
         ).json()
@@ -630,7 +644,12 @@ def test_respect_access_inactive_permission(self):
         self.api_session.auth = ("editoruser", "secret")
 
         response = self.api_session.get("/@search", params={}).json()
-        self.assertEqual(response["items_total"], 3)
+        if HAS_PLONE_6:
+            # Since Plone 6 the Plone site is indexed ...
+            self.assertEqual(response["items_total"], 4)
+        else:
+            # ... before it was not
+            self.assertEqual(response["items_total"], 3)
         response = self.api_session.get(
             "/@search", params={"Title": "Lorem Ipsum"}
         ).json()
@@ -644,7 +663,12 @@ def test_respect_access_inactive_permission(self):
 
         #  portal-enabled Editor can see expired contents
         response = self.api_session.get("/@search", params={}).json()
-        self.assertEqual(response["items_total"], 6)
+        if HAS_PLONE_6:
+            # Since Plone 6 the Plone site is indexed ...
+            self.assertEqual(response["items_total"], 7)
+        else:
+            # ... before it was not
+            self.assertEqual(response["items_total"], 6)
         response = self.api_session.get(
             "/@search", params={"Title": "Lorem Ipsum"}
         ).json()
@@ -653,7 +677,12 @@ def test_respect_access_inactive_permission(self):
         # local-enabled Editor can only access expired contents inside folder
         self.api_session.auth = ("localeditor", "secret")
         response = self.api_session.get("/@search", params={}).json()
-        self.assertEqual(response["items_total"], 1)
+        if HAS_PLONE_6:
+            # Since Plone 6 the Plone site is indexed ...
+            self.assertEqual(response["items_total"], 2)
+        else:
+            # ... before it was not
+            self.assertEqual(response["items_total"], 1)
         response = self.api_session.get(
             "/@search", params={"path": "/plone/folder"}
         ).json()

src/plone/restapi/tests/test_serializer_catalog.py

@@ -1,4 +1,6 @@
 from DateTime import DateTime
+from pkg_resources import get_distribution
+from pkg_resources import parse_version
 from plone.dexterity.utils import createContentInContainer
 from plone.restapi.interfaces import ISerializeToJson
 from plone.restapi.interfaces import ISerializeToJsonSummary
@@ -10,6 +12,13 @@
 import unittest
 
 
+HAS_PLONE_6 = parse_version(
+    get_distribution("Products.CMFPlone").version
+) >= parse_version(
+    "6.0.0a1"
+)
+
+
 class TestCatalogSerializers(unittest.TestCase):
 
     layer = PLONE_RESTAPI_DX_INTEGRATION_TESTING
@@ -43,11 +52,22 @@ def test_lazy_cat_serialization_empty_resultset(self):
             {"@id": "http://nohost", "items": [], "items_total": 0}, results
         )
 
+    @unittest.skipUnless(HAS_PLONE_6, "Since Plone 6 the Plone site is indexed ...")
     def test_lazy_map_serialization(self):
         # Test serialization of a Products.ZCatalog.Lazy.LazyMap
         lazy_map = self.catalog()
         results = getMultiAdapter((lazy_map, self.request), ISerializeToJson)()
 
+        self.assertDictContainsSubset({"@id": "http://nohost"}, results)
+        self.assertDictContainsSubset({"items_total": 3}, results)
+        self.assertEqual(3, len(results["items"]))
+
+    @unittest.skipIf(HAS_PLONE_6, "... before it was not")
+    def test_lazy_map_serialization_plone5(self):
+        # Test serialization of a Products.ZCatalog.Lazy.LazyMap
+        lazy_map = self.catalog()
+        results = getMultiAdapter((lazy_map, self.request), ISerializeToJson)()
+
         self.assertDictContainsSubset({"@id": "http://nohost"}, results)
         self.assertDictContainsSubset({"items_total": 2}, results)
         self.assertEqual(2, len(results["items"]))