Upgrade pytest-plone to 1.1.0

backend/news/462.tests

@@ -0,0 +1 @@
+Upgrade `pytest-plone` to version 1.1.0 and re-parent the acceptance remote-library bundle onto the kitconcept fixture, avoiding a duplicate Plone site under the new `keep_session` default. @ericof

backend/pyproject.toml

@@ -45,7 +45,7 @@ test = [
     "plone.restapi[test]",
     "pytest",
     "pytest-cov",
-    "pytest-plone>=1.0.0",
+    "pytest-plone>=1.1.0",
 ]
 
 [dependency-groups]
@@ -59,7 +59,7 @@ test = [
     "plone.restapi[test]",
     "pytest",
     "pytest-cov",
-    "pytest-plone>=1.0.0",
+    "pytest-plone>=1.1.0",
 ]
 
 [project.urls]

backend/src/kitconcept/core/testing/__init__.py

@@ -1,5 +1,6 @@
 from kitconcept.core.testing import layers
-from plone.app.robotframework.testing import REMOTE_LIBRARY_BUNDLE_FIXTURE
+from kitconcept.core.testing import robot
+from plone.app.robotframework.remote import RemoteLibraryLayer
 from plone.app.testing import FunctionalTesting
 from plone.app.testing import IntegrationTesting
 from plone.app.testing import PloneSandboxLayer
@@ -26,6 +27,11 @@ class Layer(PloneSandboxLayer):
     name="kitconcept.coreLayer:FunctionalTesting",
 )
 
+REMOTE_LIBRARY_BUNDLE_FIXTURE = RemoteLibraryLayer(
+    bases=(kitconcept_FIXTURE,),
+    libraries=robot.RF_LIBRARIES,
+    name="RemoteLibraryBundle:RobotRemote",
+)
 
 ACCEPTANCE_TESTING = FunctionalTesting(
     bases=(

backend/src/kitconcept/core/testing/layers.py

@@ -58,6 +58,7 @@ def setUpDefaultContent(self, app):
         sites = self.sites
         if not sites:
             raise RuntimeError("No sites defined in this fixture")
+
         for distribution_name, answers in sites:
             site_id = answers["site_id"]
             # Create Plone site
@@ -67,7 +68,6 @@ def setUpDefaultContent(self, app):
                 distribution=distribution_name,
                 **answers,
             )
-
             # Create the test user. (Plone)PAS does not have an API to create a
             # user with different userid and login name, so we call the plugin
             # directly.

backend/src/kitconcept/core/testing/robot.py

@@ -0,0 +1,20 @@
+from plone.app.robotframework.autologin import AutoLogin
+from plone.app.robotframework.content import Content
+from plone.app.robotframework.genericsetup import GenericSetup
+from plone.app.robotframework.i18n import I18N
+from plone.app.robotframework.mailhost import MockMailHost
+from plone.app.robotframework.quickinstaller import QuickInstaller
+from plone.app.robotframework.server import Zope2ServerRemote
+from plone.app.robotframework.users import Users
+
+
+RF_LIBRARIES = (
+    AutoLogin,
+    QuickInstaller,
+    GenericSetup,
+    Content,
+    Users,
+    I18N,
+    MockMailHost,
+    Zope2ServerRemote,
+)

backend/tests/conftest.py

@@ -16,11 +16,14 @@
 
 
 globals().update(
-    fixtures_factory((
-        (ACCEPTANCE_TESTING, "acceptance"),
-        (FUNCTIONAL_TESTING, "functional"),
-        (INTEGRATION_TESTING, "integration"),
-    ))
+    fixtures_factory(
+        (
+            (ACCEPTANCE_TESTING, "acceptance"),
+            (FUNCTIONAL_TESTING, "functional"),
+            (INTEGRATION_TESTING, "integration"),
+        ),
+        keep_session=True,
+    )
 )
 
 
@@ -74,7 +77,7 @@ def current_versions() -> CurrentVersions:
 
 
 @pytest.fixture(scope="session")
-def distribution() -> str:
+def distribution_name() -> str:
     return "testing"
 
 
@@ -101,10 +104,13 @@ def answers(prepare_answers) -> dict:
 
 
 @pytest.fixture(scope="session")
-def create_site(distribution):
+def create_site(distribution_name):
     def func(app, answers: dict) -> PloneSite:
         with api.env.adopt_user(SITE_OWNER_NAME):
-            site = add_site(app, distribution=distribution, **answers)
+            site_id = answers.get("site_id")
+            if site_id and (site_id in app.objectIds()):
+                app.manage_delObjects(site_id)
+            site = add_site(app, distribution=distribution_name, **answers)
         return site
 
     return func

backend/tests/creation/conftest.py

@@ -1,12 +1,10 @@
-from Acquisition import aq_parent
 from collections.abc import Generator
 from Products.CMFPlone.Portal import PloneSite
 
 import pytest
 
 
 @pytest.fixture(scope="class")
-def portal(portal_class, create_site, answers) -> Generator[PloneSite, None, None]:
-    app = aq_parent(portal_class)
-    site = create_site(app=app, answers=answers)
+def portal(app_class, create_site, answers) -> Generator[PloneSite, None, None]:
+    site = create_site(app=app_class, answers=answers)
     yield site

backend/tests/services/sites/test_sites.py

@@ -1,11 +1,14 @@
+from copy import deepcopy
+from random import randint
+
 import pytest
 
 
 class TestSitesEndpoint:
     @pytest.fixture(autouse=True)
-    def _setup(self, api_manager_request, distribution):
+    def _setup(self, api_manager_request, distribution_name):
         self.api_session = api_manager_request
-        self.url = f"@sites/{distribution}"
+        self.url = f"@sites/{distribution_name}"
 
     def test_get(self):
         response = self.api_session.get(self.url)
@@ -34,9 +37,11 @@ def test_get_add_definitions(self, key: str):
         assert key in definitions
 
     def test_post(self, answers):
-        response = self.api_session.post(self.url, json=answers)
+        _answers = deepcopy(answers)
+        _answers["site_id"] = f"plone{randint(5, 10):02d}"  # noqa: S311
+        response = self.api_session.post(self.url, json=_answers)
         data = response.json()
         assert response.status_code == 200
         assert isinstance(data, dict)
-        assert data["id"] == answers["site_id"]
+        assert data["id"] == _answers["site_id"]
         assert data["_profile_id"] == "kitconcept.core:base"