Upgrade pytest-plone to version 1.1.0

Author: ericof

backend/news/74.internal

@@ -0,0 +1 @@
+Upgrade `pytest-plone` to version 1.1.0 and adopt its new `create_site` / `app_class` fixtures in the test suite. @ericof

backend/pyproject.toml

@@ -47,7 +47,7 @@ test = [
     "pytest",
     "pytest-cov",
     "pytest-docker>=3.2.0",
-    "pytest-plone>=1.0.0",
+    "pytest-plone>=1.1.0",
     "plone-stubs",
 ]
 container = [

backend/tests/conftest.py

@@ -1,9 +1,5 @@
-from kitconcept.core.factory import add_site
 from kitconcept.website.testing import FUNCTIONAL_TESTING
 from kitconcept.website.testing import INTEGRATION_TESTING
-from plone import api
-from plone.app.testing.interfaces import SITE_OWNER_NAME
-from Products.CMFPlone.Portal import PloneSite
 from pytest_plone import fixtures_factory
 from typing import Any
 
@@ -76,13 +72,3 @@ def func() -> dict:
 @pytest.fixture(scope="session")
 def answers(prepare_answers) -> dict:
     return prepare_answers()
-
-
-@pytest.fixture(scope="session")
-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_name, **answers)
-        return site
-
-    return func

backend/tests/content_types/test_ct_lrf.py

@@ -1,4 +1,3 @@
-from Acquisition import aq_parent
 from collections.abc import Generator
 from plone.dexterity.fti import DexterityFTI
 from Products.CMFPlone.Portal import PloneSite
@@ -20,9 +19,8 @@ def answers() -> dict:
 
 
 @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/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