Run with shop 8.0.x, WIP

OXID-eSales · Dec 13, 2024 · a6df45e · a6df45e
1 parent 1032297
commit a6df45e
Show file tree

Hide file tree

Showing 35 changed files with 247 additions and 92 deletions.
diff --git a/tests/Codeception/Acceptance.suite.yml b/tests/Codeception/Acceptance.suite.yml
@@ -9,7 +9,7 @@ modules:
         - \OxidEsales\Codeception\Module\ShopSetup:
             dump: '%DUMP_PATH%'
             fixtures: '%FIXTURES_PATH%'
-            license: '%license_key%'
+            license: '%LICENSE_KEY%'
         - Db:
             dsn: 'mysql:host=%DB_HOST%;dbname=%DB_NAME%;charset=utf8'
             user: '%DB_USERNAME%'

diff --git a/tests/Codeception/Acceptance/Action/ActionMultishopCest.php b/tests/Codeception/Acceptance/Action/ActionMultishopCest.php
@@ -16,6 +16,7 @@
  * @group action
  * @group other
  * @group oe_graphql_storefront
+ * @group oe_graphql_storefront_multishop
  */
 final class ActionMultishopCest extends MultishopBaseCest
 {

diff --git a/tests/Codeception/Acceptance/Address/DeliveryAddressMultishopCest.php b/tests/Codeception/Acceptance/Address/DeliveryAddressMultishopCest.php
@@ -17,6 +17,7 @@
 /**
  * @group address
  * @group oe_graphql_storefront
+ * @group oe_graphql_storefront_multishop
  */
 final class DeliveryAddressMultiShopCest extends MultishopBaseCest
 {

diff --git a/tests/Codeception/Acceptance/Address/InvoiceAddressMultiShopCest.php b/tests/Codeception/Acceptance/Address/InvoiceAddressMultiShopCest.php
@@ -16,6 +16,7 @@
 /**
  * @group address
  * @group oe_graphql_storefront
+ * @group oe_graphql_storefront_multishop
  */
 final class InvoiceAddressMultiShopCest extends MultishopBaseCest
 {

diff --git a/tests/Codeception/Acceptance/Attribute/AttributeMultishopCest.php b/tests/Codeception/Acceptance/Attribute/AttributeMultishopCest.php
@@ -18,6 +18,7 @@
  * @group attribute
  * @group other
  * @group oe_graphql_storefront
+ * @group oe_graphql_storefront_multishop
  */
 final class AttributeMultishopCest extends MultishopBaseCest
 {

diff --git a/tests/Codeception/Acceptance/Banner/BannerMultishopCest.php b/tests/Codeception/Acceptance/Banner/BannerMultishopCest.php
@@ -16,6 +16,7 @@
  * @group banner
  * @group other
  * @group oe_graphql_storefront
+ * @group oe_graphql_storefront_multishop
  */
 final class BannerMultishopCest extends MultishopBaseCest
 {

diff --git a/tests/Codeception/Acceptance/Basket/BasketAddItemMultishopCest.php b/tests/Codeception/Acceptance/Basket/BasketAddItemMultishopCest.php
@@ -16,6 +16,7 @@
 /**
  * @group basket
  * @group oe_graphql_storefront
+ * @group oe_graphql_storefront_multishop
  */
 final class BasketAddItemMultishopCest extends MultishopBaseCest
 {

diff --git a/tests/Codeception/Acceptance/Basket/BasketDeliveryAddressMultishopCest.php b/tests/Codeception/Acceptance/Basket/BasketDeliveryAddressMultishopCest.php
@@ -17,6 +17,7 @@
  * @group address
  * @group basket
  * @group oe_graphql_storefront
+ * @group oe_graphql_storefront_multishop
  */
 final class BasketDeliveryAddressMultiShopCest extends MultishopBaseCest
 {

diff --git a/tests/Codeception/Acceptance/Basket/BasketMultishopCest.php b/tests/Codeception/Acceptance/Basket/BasketMultishopCest.php
@@ -16,6 +16,7 @@
  * @group basket
  * @group basket_access
  * @group oe_graphql_storefront
+ * @group oe_graphql_storefront_multishop
  */
 final class BasketMultishopCest extends MultishopBaseCest
 {

diff --git a/tests/Codeception/Acceptance/Basket/BasketRemoveMultishopCest.php b/tests/Codeception/Acceptance/Basket/BasketRemoveMultishopCest.php
@@ -16,6 +16,7 @@
 /**
  * @group basket
  * @group oe_graphql_storefront
+ * @group oe_graphql_storefront_multishop
  */
 final class BasketRemoveMultishopCest extends MultishopBaseCest
 {

diff --git a/tests/Codeception/Acceptance/Basket/BasketsMultishopCest.php b/tests/Codeception/Acceptance/Basket/BasketsMultishopCest.php
@@ -16,6 +16,7 @@
 /**
  * @group basket
  * @group oe_graphql_storefront
+ * @group oe_graphql_storefront_multishop
  */
 final class BasketsMultishopCest extends MultishopBaseCest
 {

diff --git a/tests/Codeception/Acceptance/Content/ContentMultishopCest.php b/tests/Codeception/Acceptance/Content/ContentMultishopCest.php
@@ -18,6 +18,7 @@
  * @group content
  * @group oe_graphql_storefront
  * @group other
+ * @group oe_graphql_storefront_multishop
  */
 final class ContentMultishopCest extends MultishopBaseCest
 {

diff --git a/tests/Codeception/Acceptance/Country/CountryEnterpriseCest.php b/tests/Codeception/Acceptance/Country/CountryEnterpriseCest.php
@@ -17,6 +17,7 @@
  * @group country
  * @group oe_graphql_storefront
  * @group other
+ * @group oe_graphql_storefront_multishop
  */
 final class CountryEnterpriseCest extends MultishopBaseCest
 {

diff --git a/tests/Codeception/Acceptance/Currency/CurrencyMultishopCest.php b/tests/Codeception/Acceptance/Currency/CurrencyMultishopCest.php
@@ -18,6 +18,7 @@
  * @group currency
  * @group oe_graphql_storefront
  * @group other
+ * @group oe_graphql_storefront_multishop
  */
 final class CurrencyMultishopCest extends MultishopBaseCest
 {

diff --git a/tests/Codeception/Acceptance/Customer/CustomerDeleteMultiShopCest.php b/tests/Codeception/Acceptance/Customer/CustomerDeleteMultiShopCest.php
@@ -15,6 +15,7 @@
 /**
  * @group customer
  * @group oe_graphql_storefront
+ * @group oe_graphql_storefront_multishop
  */
 final class CustomerDeleteMultiShopCest extends MultishopBaseCest
 {

diff --git a/tests/Codeception/Acceptance/Customer/CustomerMultiShopCest.php b/tests/Codeception/Acceptance/Customer/CustomerMultiShopCest.php
@@ -17,6 +17,7 @@
 /**
  * @group customer
  * @group oe_graphql_storefront
+ * @group oe_graphql_storefront_multishop
  */
 final class CustomerMultiShopCest extends MultishopBaseCest
 {

diff --git a/tests/Codeception/Acceptance/Manufacturer/ManufacturerMultishopCest.php b/tests/Codeception/Acceptance/Manufacturer/ManufacturerMultishopCest.php
@@ -17,6 +17,7 @@
  * @group manufacturer
  * @group oe_graphql_storefront
  * @group other
+ * @group oe_graphql_storefront_multishop
  */
 final class ManufacturerMultishopCest extends MultishopBaseCest
 {

diff --git a/tests/Codeception/Acceptance/MultishopBaseCest.php b/tests/Codeception/Acceptance/MultishopBaseCest.php
@@ -11,13 +11,19 @@
 namespace OxidEsales\GraphQL\Storefront\Tests\Codeception\Acceptance;
 
 use Codeception\Scenario;
-use OxidEsales\Eshop\Core\Exception\DatabaseErrorException;
+use OxidEsales\Eshop\Application\Model\Shop;
+use OxidEsales\Eshop\Core\DatabaseProvider;
+use OxidEsales\Eshop\Core\Model\ListModel;
 use OxidEsales\Eshop\Core\Registry;
+use OxidEsales\EshopCommunity\Core\Di\ContainerFacade;
 use OxidEsales\EshopCommunity\Internal\Container\ContainerFactory;
+use OxidEsales\EshopCommunity\Internal\Framework\Edition\Edition;
+use OxidEsales\EshopCommunity\Internal\Framework\Edition\EditionDirectoriesLocator;
+use OxidEsales\EshopCommunity\Internal\Framework\FileSystem\ProjectDirectoriesLocator;
 use OxidEsales\EshopCommunity\Internal\Framework\Module\Configuration\Bridge\ShopConfigurationDaoBridgeInterface;
 use OxidEsales\EshopCommunity\Internal\Framework\Module\Setup\Bridge\ModuleActivationBridgeInterface;
+use OxidEsales\EshopEnterprise\Application\Controller\Admin\ShopMain;
 use OxidEsales\EshopEnterprise\Internal\Framework\Module\Configuration\Bridge\ShopConfigurationGeneratorBridgeInterface;
-use OxidEsales\Facts\Facts;
 use OxidEsales\GraphQL\Storefront\Tests\Codeception\AcceptanceTester;
 use Psr\Container\ContainerInterface;
 
@@ -27,9 +33,7 @@ abstract class MultishopBaseCest extends BaseCest
 
     public function _before(AcceptanceTester $I, Scenario $scenario): void
     {
-        $facts = new Facts();
-
-        if (!$facts->isEnterprise()) {
+        if (!(new EditionDirectoriesLocator())->getEditionRootPath(Edition::Enterprise)){
             $scenario->skip('Skip EE related tests for CE/PE edition');
 
             return;
@@ -44,9 +48,8 @@ public function _after(AcceptanceTester $I): void
     {
         parent::_after($I);
 
-        $facts = new Facts();
-        if ($facts->isEnterprise()) {
-            $I->updateConfigInDatabaseForShops('blMallUsers', false, 'bool', [1, 2]);
+        if ((new EditionDirectoriesLocator())->getEditionRootPath(Edition::Enterprise)){
+            $I->updateInDatabase('oxconfig', ['oxvarvalue' => false], ['oxvarname' => 'blMallUsers']);
         }
     }
 
@@ -58,6 +61,16 @@ private function ensureSubshop(): void
         $container->get(ShopConfigurationDaoBridgeInterface::class)->save($shopConfiguration);
         $container->get(ShopConfigurationGeneratorBridgeInterface::class)->generateForShop(self::SUBSHOP_ID);
 
+        $shop = oxNew(Shop::class);
+        $shop->load(1);
+        $shop->assign(
+            [
+                'oxid' => self::SUBSHOP_ID
+            ]
+        );
+        $shop->save();
+
+        #$this->copyConfig();
         $this->copyContent();
         $this->regenerateDatabaseViews();
         $this->activateModule($container);
@@ -67,8 +80,7 @@ private function ensureSubshop(): void
 
     private function regenerateDatabaseViews(): void
     {
-        $vendorPath = (new Facts())->getVendorPath();
-        exec($vendorPath . '/bin/oe-eshop-db_views_generate');
+        exec((new ProjectDirectoriesLocator())->getVendorPath() . '/bin/oe-eshop-db_views_generate');
     }
 
     private function activateModule(ContainerInterface $container)
@@ -84,20 +96,44 @@ private function activateModule(ContainerInterface $container)
     private function copyContent()
     {
         //copy contents
-        $shopContentList = oxNew(\OxidEsales\Eshop\Core\Model\ListModel::class);
+        $shopContentList = oxNew(ListModel::class);
         $shopContentList->init("oxi18n", 'oxcontents');
         $shopContentList->getBaseObject()->setEnableMultilang(false);
 
         $shopContentList->selectString("select * from oxcontents where oxshopid = '1'");
         foreach ($shopContentList as $shopContent) {
-            try {
-                $shopContent->oxcontents__oxshopid->setValue(self::SUBSHOP_ID);
-                $shopContent->delete();
-                $shopContent->setId();
-                $shopContent->save();
-            } catch (DatabaseErrorException $e) {
-                // This happen on executing multiple tests
+            $shopContent->oxcontents__oxshopid->setValue(self::SUBSHOP_ID);
+            $shopContent->setId();
+            $shopContent->save();
+        }
+    }
+
+    private function copyConfig(): void
+    {
+        $utilsObject = Registry::getUtilsObject();
+        $db = DatabaseProvider::getDb();
+
+        $selectShopConfigurationQuery =
+            "select oxvarname, oxvartype, oxvarvalue, oxmodule
+            from oxconfig where oxshopid = '1'";
+
+        $shopConfiguration = $db->select($selectShopConfigurationQuery);
+        if ($shopConfiguration != false && $shopConfiguration->count() > 0) {
+            while (!$shopConfiguration->EOF) {
+                $newId = $utilsObject->generateUID();
+                $insertNewConfigQuery =
+                    "insert into oxconfig (oxid, oxshopid, oxvarname, oxvartype, oxvarvalue, oxmodule)
+                     values (:oxid, :oxshopid, :oxvarname, :oxvartype, :value, :oxmodule)";
+                $db->execute($insertNewConfigQuery, [
+                    ':oxid' => $newId,
+                    ':oxshopid' => self::SUBSHOP_ID,
+                    ':oxvarname' => $shopConfiguration->fields[0],
+                    ':oxvartype' => $shopConfiguration->fields[1],
+                    ':value' => $shopConfiguration->fields[2],
+                    ':oxmodule' => $shopConfiguration->fields[3],
+                ]);
             }
+            $shopConfiguration->fetchRow();
         }
     }
 }
diff --git a/tests/Codeception/Acceptance/NewsletterStatus/NewsletterStatusMultiShopCest.php b/tests/Codeception/Acceptance/NewsletterStatus/NewsletterStatusMultiShopCest.php
@@ -17,6 +17,7 @@
  * @group newsletterstatus
  * @group oe_graphql_storefront
  * @group other
+ * @group oe_graphql_storefront_multishop
  */
 final class NewsletterStatusMultiShopCest extends MultishopBaseCest
 {

diff --git a/tests/Codeception/Acceptance/NewsletterStatus/NewsletterStatusSubscribeMultiShopCest.php b/tests/Codeception/Acceptance/NewsletterStatus/NewsletterStatusSubscribeMultiShopCest.php
@@ -18,6 +18,7 @@
  * @group newsletterstatus
  * @group oe_graphql_storefront
  * @group other
+ * @group oe_graphql_storefront_multishop
  */
 final class NewsletterStatusSubscribeMultiShopCest extends MultishopBaseCest
 {

diff --git a/tests/Codeception/Acceptance/Order/CustomerOrderFilesMultiShopCest.php b/tests/Codeception/Acceptance/Order/CustomerOrderFilesMultiShopCest.php
@@ -15,6 +15,7 @@
 /**
  * @group order
  * @group oe_graphql_storefront
+ * @group oe_graphql_storefront_multishop
  */
 final class CustomerOrderFilesMultiShopCest extends MultishopBaseCest
 {

diff --git a/tests/Codeception/Acceptance/Order/CustomerOrderHistoryCest.php b/tests/Codeception/Acceptance/Order/CustomerOrderHistoryCest.php
@@ -12,7 +12,8 @@
 use Codeception\Example;
 use Codeception\Scenario;
 use OxidEsales\Eshop\Core\Registry as EshopRegistry;
-use OxidEsales\Facts\Facts;
+use OxidEsales\EshopCommunity\Internal\Framework\Edition\Edition;
+use OxidEsales\EshopCommunity\Internal\Framework\Edition\EditionDirectoriesLocator;
 use OxidEsales\GraphQL\Storefront\Tests\Codeception\Acceptance\BaseCest;
 use OxidEsales\GraphQL\Storefront\Tests\Codeception\AcceptanceTester;
 
@@ -500,9 +501,7 @@ private function assertInvoiceAddress(AcceptanceTester $I, array $address): void
             'state' => null,
         ];
 
-        $facts = new Facts();
-
-        if ($facts->getEdition() !== 'EE') {
+        if (!(new EditionDirectoriesLocator())->getEditionRootPath(Edition::Enterprise)){
             $expected['vatID'] = '';
         }
 

diff --git a/tests/Codeception/Acceptance/Order/CustomerOrderHistoryMultiShopCest.php b/tests/Codeception/Acceptance/Order/CustomerOrderHistoryMultiShopCest.php
@@ -17,6 +17,7 @@
 /**
  * @group order
  * @group oe_graphql_storefront
+ * @group oe_graphql_storefront_multishop
  */
 final class CustomerOrderHistoryMultiShopCest extends MultishopBaseCest
 {

diff --git a/tests/Codeception/Acceptance/Order/CustomerOrderItemsMultiShopCest.php b/tests/Codeception/Acceptance/Order/CustomerOrderItemsMultiShopCest.php
@@ -15,6 +15,7 @@
 /**
  * @group order
  * @group oe_graphql_storefront
+ * @group oe_graphql_storefront_multishop
  */
 final class CustomerOrderItemsMultiShopCest extends MultishopBaseCest
 {

diff --git a/tests/Codeception/Acceptance/Order/CustomerOrderPaymentMultiShopCest.php b/tests/Codeception/Acceptance/Order/CustomerOrderPaymentMultiShopCest.php
@@ -17,6 +17,7 @@
 /**
  * @group order
  * @group oe_graphql_storefront
+ * @group oe_graphql_storefront_multishop
  */
 final class CustomerOrderPaymentMultiShopCest extends MultishopBaseCest
 {

diff --git a/tests/Codeception/Acceptance/Product/ProductMultishopCest.php b/tests/Codeception/Acceptance/Product/ProductMultishopCest.php
@@ -19,6 +19,7 @@
  * @group product
  * @group oe_graphql_storefront
  * @group other
+ * @group oe_graphql_storefront_multishop
  */
 final class ProductMultishopCest extends MultishopBaseCest
 {

diff --git a/tests/Codeception/Acceptance/Promotion/PromotionMultishopCest.php b/tests/Codeception/Acceptance/Promotion/PromotionMultishopCest.php
@@ -16,6 +16,7 @@
  * @group promotion
  * @group other
  * @group oe_graphql_storefront
+ * @group oe_graphql_storefront_multishop
  */
 final class PromotionMultishopCest extends MultishopBaseCest
 {

diff --git a/tests/Codeception/Acceptance/Review/ReviewMultiShopCest.php b/tests/Codeception/Acceptance/Review/ReviewMultiShopCest.php
@@ -18,6 +18,7 @@
  * @group review
  * @group oe_graphql_storefront
  * @group other
+ * @group oe_graphql_storefront_multishop
  */
 final class ReviewMultiShopCest extends MultishopBaseCest
 {

diff --git a/tests/Codeception/Acceptance/Vendor/VendorMultishopCest.php b/tests/Codeception/Acceptance/Vendor/VendorMultishopCest.php
@@ -18,6 +18,7 @@
  * @group vendor
  * @group oe_graphql_storefront
  * @group other
+ * @group oe_graphql_storefront_multishop
  */
 final class VendorMultishopCest extends MultishopBaseCest
 {

diff --git a/tests/Codeception/Acceptance/Voucher/VoucherMultiShopCest.php b/tests/Codeception/Acceptance/Voucher/VoucherMultiShopCest.php
@@ -17,6 +17,7 @@
  * @group voucher
  * @group oe_graphql_storefront
  * @group pricing
+ * @group oe_graphql_storefront_multishop
  */
 final class VoucherMultiShopCest extends MultishopBaseCest
 {

diff --git a/tests/Codeception/Acceptance/WishedPrice/WishedPriceMultiShopCest.php b/tests/Codeception/Acceptance/WishedPrice/WishedPriceMultiShopCest.php
@@ -19,6 +19,7 @@
  * @group wishedprice
  * @group oe_graphql_storefront
  * @group pricing
+ * @group oe_graphql_storefront_multishop
  */
 final class WishedPriceMultiShopCest extends MultishopBaseCest
 {

diff --git a/tests/Codeception/Acceptance/_bootstrap.php b/tests/Codeception/Acceptance/_bootstrap.php
@@ -8,6 +8,7 @@
 declare(strict_types=1);
 
 // This is acceptance bootstrap
+use OxidEsales\EshopCommunity\Internal\Framework\FileSystem\ProjectRootLocator;
 use Symfony\Component\Filesystem\Path;
 
-require_once Path::join((new \OxidEsales\Facts\Facts())->getShopRootPath(), 'source', 'bootstrap.php');
+require_once Path::join((new ProjectRootLocator())->getProjectRoot(), 'source', 'bootstrap.php');