fix upgrade tests setup

collective · Apr 11, 2023 · 9805bc2 · 9805bc2
1 parent 3a25c82
commit 9805bc2
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 10 deletions.
diff --git a/src/collective/ckeditor/custom-properties.zcml b/src/collective/ckeditor/custom-properties.zcml
@@ -0,0 +1,33 @@
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:genericsetup="http://namespaces.zope.org/genericsetup"
+    xmlns:meta="http://namespaces.zope.org/meta"
+    i18n_domain="collective.ckeditor">
+
+    <meta:provides feature="migration-registry" />
+
+    <include file="configure.zcml" />
+
+    <genericsetup:registerProfile
+      name="testing_to_registry"
+      title="Test properties to registry migration"
+      directory="profiles/testing_to_registry"
+      description=""
+      provides="Products.GenericSetup.interfaces.EXTENSION"
+      />
+
+    <genericsetup:upgradeSteps
+        source="4350"
+        destination="4355"
+        profile="collective.ckeditor:default">
+
+    <genericsetup:upgradeDepends
+        title="Migrate properties to registry"
+        description=""
+        import_profile="collective.ckeditor:testing_to_registry"
+        import_steps="propertiestool"
+        />
+
+    </genericsetup:upgradeSteps>
+
+</configure>
diff --git a/src/collective/ckeditor/migration-registry.zcml b/src/collective/ckeditor/migration-registry.zcml
@@ -17,15 +17,21 @@
       />
 
     <genericsetup:upgradeSteps
-        source="4350"
-        destination="4355"
-        profile="collective.ckeditor:default">
-
-    <genericsetup:upgradeDepends
-        title="Migrate properties to registry"
-        description=""
-        import_profile="collective.ckeditor:testing_to_registry"
-        import_steps="propertiestool"
+        source="4355"
+        destination="4360"
+        profile="collective.ckeditor:default"
+        >
+
+        <genericsetup:upgradeDepends
+            title="Registry"
+            description=""
+            import_steps="plone.app.registry"
+        />
+
+        <genericsetup:upgradeStep
+             title="Migrate to plone.app.registry"
+             description="Copy portal_properties to registry"
+             handler=".upgrades.to_registry"
         />
 
     </genericsetup:upgradeSteps>

diff --git a/src/collective/ckeditor/pytests/test_upgrade.py b/src/collective/ckeditor/pytests/test_upgrade.py
@@ -12,6 +12,13 @@ def plone_instance(tmp_path_factory, pytestconfig):
     with zi:
         yield zi
 
+@pytest.mark.upgrade
+def test_plone_is_running(plone_instance):
+    request = requests.get(
+        "http://localhost:8080/Plone",
+        auth=("admin", "admin"),
+    )
+    assert request.status_code == 200
 
 def check_boolean(registry_name, value_to_check):
     request = requests.get(

diff --git a/src/collective/ckeditor/pytests/zope_instance.py b/src/collective/ckeditor/pytests/zope_instance.py
@@ -92,7 +92,7 @@ def run_buildouts(self, from_version):
                 "bin/buildout",
                 "-N",
                 "buildout:eggs-directory=%s" % self.eggs_directory,
-                "instance:zcml=collective.ckeditor:migration-registry.zcml",
+                "instance:zcml=collective.ckeditor:custom-properties.zcml",
                 "plonesite:upgrade-profiles=collective.ckeditor:default",
                 "install",
                 "instance",
@@ -111,6 +111,7 @@ def run_buildouts(self, from_version):
                 "bin/buildout",
                 "-N",
                 "buildout:eggs-directory=%s" % self.eggs_directory,
+                "instance:zcml=collective.ckeditor:migration-registry.zcml",
                 "install",
                 "instance",
                 "plonesite",