OXDEV-7732: Adjust module for new recipe structure

OXID-eSales · May 2, 2024 · 015c4c9 · 015c4c9
1 parent ca0c48e
commit 015c4c9
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 25 deletions.
diff --git a/.github/oxid-esales/graphql-configuration-access_light.yaml b/.github/oxid-esales/graphql-configuration-access_light.yaml
@@ -11,16 +11,6 @@ install_shop_with_modules:
                     "oxid-esales/apex-theme": "{{ .Data.global.composer.dev_ref }}",
                     "oxid-esales/developer-tools": "{{ .Data.global.composer.dev_ref }}",
                     "oxid-esales/graphql-configuration-access": "{{ .Data.global.composer.ref_name }}",
-                    "codeception/module-rest": "^3.3",
-                    "codeception/module-phpbrowser": "^3.0",
-                    "codeception/c3": "^2.9"
-                },
-                "config":{
-                    "allow-plugins":{
-                      "oxid-esales/oxideshop-composer-plugin": true,
-                      "oxid-esales/oxideshop-unified-namespace-generator": true,
-                      "codeception/c3": true
-                    }
                 },
                 "repositories": {
                     "oxid-esales/graphql-configuration-access": {

diff --git a/composer.json b/composer.json
@@ -37,7 +37,11 @@
         "codeception/module-rest": "*",
         "codeception/module-phpbrowser": "*",
         "codeception/module-db": "*",
-        "phpstan/phpstan": "^1.10"
+        "phpstan/phpstan": "^1.10",
+        "mikey179/vfsstream": "~1.6.8",
+        "codeception/codeception": "^5.0",
+        "oxid-esales/codeception-modules": "dev-b-7.0.x",
+        "codeception/module-asserts": "^3.0"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
@@ -69,20 +73,16 @@
             "@deptrac"
         ],
 
-        "phpunit": "vendor/bin/phpunit --bootstrap=/var/www/source/bootstrap.php --config=tests/ --testsuite=Unit",
+        "phpunit": "vendor/bin/phpunit --config=tests/ --testsuite=Unit",
         "phpintegration": "vendor/bin/phpunit --bootstrap=/var/www/source/bootstrap.php --config=tests/ --testsuite=Integration",
         "phpunit-coverage": "XDEBUG_MODE=coverage vendor/bin/phpunit --coverage-text --bootstrap=/var/www/source/bootstrap.php --config=tests/ --coverage-html=tests/reports/coverage",
 
         "codeception": [
             "Composer\\Config::disableProcessTimeout",
-            "MODULE_IDS=oe_graphql_base,oe_graphql_configuration_access /var/www/vendor/bin/codecept run Acceptance -c /var/www/vendor/oxid-esales/graphql-configuration-access/tests/codeception.yml --no-redirect"
+            "MODULE_IDS=oe_graphql_base,oe_graphql_configuration_access SHOP_ROOT_PATH=/var/www vendor/bin/codecept run Acceptance -c /var/www/vendor/oxid-esales/graphql-configuration-access/tests/codeception.yml --no-redirect"
         ]
     },
     "config": {
-        "allow-plugins": {
-            "oxid-esales/oxideshop-unified-namespace-generator": true,
-            "oxid-esales/oxideshop-composer-plugin": true,
-            "cyclonedx/cyclonedx-php-composer": true
-        }
+        "allow-plugins": false
     }
 }
diff --git a/tests/Codeception/Acceptance/_bootstrap.php b/tests/Codeception/Acceptance/_bootstrap.php
@@ -8,7 +8,3 @@
 declare(strict_types=1);
 
 // This is acceptance bootstrap
-
-use Symfony\Component\Filesystem\Path;
-
-require_once Path::join((new \OxidEsales\Facts\Facts())->getShopRootPath(), 'source', 'bootstrap.php');
diff --git a/tests/Codeception/Config/params.php b/tests/Codeception/Config/params.php
@@ -12,6 +12,10 @@
 use OxidEsales\Facts\Facts;
 use Symfony\Component\Filesystem\Path;
 
+if ($shopRootPath = getenv('SHOP_ROOT_PATH')){
+    require_once(Path::join($shopRootPath, 'source', 'bootstrap.php'));
+}
+
 $facts = new Facts();
 return [
     'SHOP_URL' => $facts->getShopUrl(),

diff --git a/tests/phpunit.xml b/tests/phpunit.xml
@@ -1,12 +1,21 @@
 <?xml version="1.0"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         bootstrap="../../../../bootstrap.php"
-         colors="true"
          backupGlobals="true"
+         processIsolation="false"
+         stopOnError="false"
+         stopOnFailure="false"
+         stopOnIncomplete="false"
+         stopOnSkipped="false"
          beStrictAboutTestsThatDoNotTestAnything="false"
-         cacheDirectory=".phpunit.cache"
          xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+         cacheDirectory=".phpunit.cache"
+         backupStaticProperties="false"
+         requireCoverageMetadata="false"
          displayDetailsOnTestsThatTriggerWarnings="true"
+         displayDetailsOnTestsThatTriggerNotices="true"
+         displayDetailsOnTestsThatTriggerErrors="true"
+         displayDetailsOnTestsThatTriggerDeprecations="true"
+         colors="true">
 >
     <testsuites>
         <testsuite name="Unit">