Merge branch 'MC-34459' into 2.4-develop-com-int-improve-pr2

ysapiga · ysapiga · commit 9cf7c69b412f · 2020-06-16T16:42:46.000+03:00
diff --git a/dev/tests/integration/_files/Magento/TestModuleOverrideConfig/etc/adminhtml/system.xml b/dev/tests/integration/_files/Magento/TestModuleOverrideConfig/etc/adminhtml/system.xml
@@ -12,6 +12,8 @@
                 <field id="field_1" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1"/>
                 <field id="field_2" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1"/>
                 <field id="field_3" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1"/>
+                <field id="field_4" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1"/>
+                <field id="field_5" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1"/>
             </group>
         </section>
     </system>
diff --git a/dev/tests/integration/_files/Magento/TestModuleOverrideConfig/etc/config.xml b/dev/tests/integration/_files/Magento/TestModuleOverrideConfig/etc/config.xml
@@ -12,6 +12,8 @@
                 <field_1>1st field default value</field_1>
                 <field_2>2nd field default value</field_2>
                 <field_3>3rd field default value</field_3>
+                <field_4>4th field default value</field_4>
+                <field_5>5th field default value</field_5>
             </test_group>
         </test_section>
     </default>
diff --git a/dev/tests/integration/_files/Magento/TestModuleOverrideConfig2/Test/Integration/_files/overrides.xml b/dev/tests/integration/_files/Magento/TestModuleOverrideConfig2/Test/Integration/_files/overrides.xml
@@ -204,4 +204,9 @@
             <dataSet name="first_data_set" skip="true"/>
         </method>
     </test>
+    <global>
+        <magentoDataFixture path="Magento/TestModuleOverrideConfig/_files/global_fixture_first_module.php" />
+        <magentoConfigFixture scopeType="store" scopeCode="current" path="test_section/test_group/field_4" value="4th field globally overridden value"/>
+        <magentoConfigFixture scopeType="store" scopeCode="current" path="test_section/test_group/field_5" newValue="5th field globally replaced value"/>
+    </global>
 </overrides>
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Workaround/Override/Config.php b/dev/tests/integration/framework/Magento/TestFramework/Workaround/Override/Config.php
@@ -74,6 +74,22 @@ public static function getInstance(): ConfigInterface
         return self::$instance;
     }
 
+    /**
+     * Get config from global node
+     *
+     * @param string|null $fixtureType
+     * @return array
+     */
+    public function getGlobalConfig(?string $fixtureType = null): array
+    {
+        $result = $this->config['global'] ?? [];
+        if ($fixtureType) {
+            $result = $result[$fixtureType] ?? [];
+        }
+
+        return $result;
+    }
+
     /**
      * Self instance setter.
      *
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Workaround/Override/Config/Converter.php b/dev/tests/integration/framework/Magento/TestFramework/Workaround/Override/Config/Converter.php
@@ -40,7 +40,7 @@ public function __construct(array $types = [])
     public function convert($source)
     {
         $this->xpath = new \DOMXPath($source);
-        $config = [];
+        $config = $this->getGlobalConfig($this->xpath);
         foreach ($this->xpath->query('//test') as $testOverride) {
             $className = ltrim($testOverride->getAttribute('class'), '\\');
             $config[$className] = $this->getTestConfigByFixtureType($testOverride);
@@ -189,4 +189,36 @@ protected function fillAdminConfigFixtureAttributes(\DOMElement $fixture): array
             'remove' => $fixture->getAttribute('remove'),
         ];
     }
+    /**
+     * Get global configurations
+     *
+     * @param \DOMXPath $xpath
+     * @return array
+     */
+    private function getGlobalConfig(\DOMXPath $xpath): array
+    {
+        foreach ($xpath->query('//global') as $globalOverride) {
+            $config = $this->fillGlobalConfigByFixtureType($globalOverride);
+        }
+
+        return $config ?? [];
+    }
+
+    /**
+     * Fill global configurations node
+     *
+     * @param \DOMElement $node
+     * @return array
+     */
+    private function fillGlobalConfigByFixtureType(\DOMElement $node): array
+    {
+        $config = [];
+        foreach (self::FIXTURE_TYPES as $fixtureType) {
+            foreach ($node->getElementsByTagName($fixtureType) as $fixture) {
+                $config['global'][$fixtureType][] = $this->fillAttributes($fixture);
+            }
+        }
+
+        return $config;
+    }
 }
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Workaround/Override/Fixture/Applier/Base.php b/dev/tests/integration/framework/Magento/TestFramework/Workaround/Override/Fixture/Applier/Base.php
@@ -12,6 +12,9 @@
  */
 abstract class Base implements ApplierInterface
 {
+    /** @var array */
+    private $globalConfig;
+
     /** @var array */
     private $classConfig;
 
@@ -21,6 +24,27 @@ abstract class Base implements ApplierInterface
     /** @var array */
     private $dataSetConfig;
 
+    /**
+     * Get global node config
+     *
+     * @return array
+     */
+    public function getGlobalConfig(): array
+    {
+        return $this->globalConfig;
+    }
+
+    /**
+     * Set global node config
+     *
+     * @param array $globalConfig
+     * @return void
+     */
+    public function setGlobalConfig(array $globalConfig): void
+    {
+        $this->globalConfig = $globalConfig;
+    }
+
     /**
      * Get class node config
      *
@@ -92,6 +116,7 @@ public function setDataSetConfig(array $dataSetConfig): void
     protected function getPrioritizedConfig(): array
     {
         return [
+            $this->getGlobalConfig(),
             $this->getClassConfig(),
             $this->getMethodConfig(),
             $this->getDataSetConfig(),
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Workaround/Override/Fixture/Resolver.php b/dev/tests/integration/framework/Magento/TestFramework/Workaround/Override/Fixture/Resolver.php
@@ -203,6 +203,7 @@ private function getApplier(TestCase $test, string $fixtureType): ApplierInterfa
         }
         /** @var Base $applier */
         $applier = $this->appliersList[$fixtureType];
+        $applier->setGlobalConfig($this->config->getGlobalConfig($fixtureType));
         $applier->setClassConfig($this->config->getClassConfig($test, $fixtureType));
         $applier->setMethodConfig($this->config->getMethodConfig($test, $fixtureType));
         $applier->setDataSetConfig(
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Workaround/etc/overrides.xsd b/dev/tests/integration/framework/Magento/TestFramework/Workaround/etc/overrides.xsd
@@ -10,6 +10,7 @@
         <xs:complexType>
             <xs:sequence minOccurs="0" maxOccurs="unbounded">
                 <xs:element name="test" type="test" minOccurs="0" maxOccurs="unbounded" />
+                <xs:element name="global" type="global" minOccurs="0" maxOccurs="unbounded" />
             </xs:sequence>
         </xs:complexType>
     </xs:element>
@@ -77,4 +78,12 @@
         <xs:attribute name="newValue" type="xs:string"/>
         <xs:attribute name="remove" type="xs:boolean"/>
     </xs:complexType>
+    <xs:complexType name="global">
+    <xs:sequence minOccurs="0" maxOccurs="unbounded">
+        <xs:element name="magentoDataFixture" type="dataFixture" minOccurs="0" maxOccurs="unbounded" />
+        <xs:element name="magentoDataFixtureBeforeTransaction" type="dataFixture" minOccurs="0" maxOccurs="unbounded" />
+        <xs:element name="magentoConfigFixture" type="configFixture"  minOccurs="0" maxOccurs="unbounded" />
+        <xs:element name="magentoAdminConfigFixture" type="adminConfigFixture"  minOccurs="0" maxOccurs="unbounded" />
+    </xs:sequence>
+    </xs:complexType>
 </xs:schema>
diff --git a/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Model/MassScheduleTest.php b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Model/MassScheduleTest.php
@@ -26,6 +26,8 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ *
+ * @magentoDbIsolation disabled
  */
 class MassScheduleTest extends \PHPUnit\Framework\TestCase
 {
@@ -64,6 +66,9 @@ class MassScheduleTest extends \PHPUnit\Framework\TestCase
      */
     private $skus = [];
 
+    /** @var string */
+    private $logFilePath;
+
     /**
      * @var Registry
      */
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RelationTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RelationTest.php
@@ -15,6 +15,8 @@
 
 /**
  * Test relation customization
+ *
+ * @magentoDbIsolation disabled
  */
 class RelationTest extends \Magento\TestFramework\Indexer\TestCase
 {
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/AbstractProductExportImportTestCase.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/AbstractProductExportImportTestCase.php
@@ -9,6 +9,8 @@
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\ImportExport\Model\Export\Adapter\AbstractAdapter;
 use Magento\Store\Model\Store;
+use Magento\TestFramework\Annotation\DataFixture;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
 /**
  * Abstract class for testing product export and import scenarios
@@ -242,6 +244,7 @@ protected function executeImportDeleteTest(array $skus, string $csvFile = null):
      */
     protected function executeFixtures(array $fixtures, bool $rollback = false)
     {
+        Resolver::getInstance()->setCurrentFixtureType(DataFixture::ANNOTATION);
         foreach ($fixtures as $fixture) {
             $fixturePath = $this->resolveFixturePath($fixture, $rollback);
             include $fixturePath;
diff --git a/dev/tests/integration/testsuite/Magento/Framework/DB/Adapter/InterfaceTest.php b/dev/tests/integration/testsuite/Magento/Framework/DB/Adapter/InterfaceTest.php
@@ -9,6 +9,9 @@
  */
 namespace Magento\Framework\DB\Adapter;
 
+/**
+ * @magentoDbIsolation disabled
+ */
 class InterfaceTest extends \PHPUnit\Framework\TestCase
 {
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Framework/DB/Adapter/Pdo/MysqlTest.php b/dev/tests/integration/testsuite/Magento/Framework/DB/Adapter/Pdo/MysqlTest.php
@@ -10,6 +10,11 @@
 use Magento\Framework\DB\Ddl\Table;
 use Magento\TestFramework\Helper\Bootstrap;
 
+/**
+ * Class checks Mysql adapter behaviour
+ *
+ * @magentoDbIsolation disabled
+ */
 class MysqlTest extends \PHPUnit\Framework\TestCase
 {
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Framework/DB/TransactionTest.php b/dev/tests/integration/testsuite/Magento/Framework/DB/TransactionTest.php
@@ -67,10 +67,13 @@ public function testTransactionLevelDbIsolationEnabled()
         $this->assertEquals(1, $resourceConnection->getConnection('default')->getTransactionLevel());
     }
 
+    /**
+     * @magentoDataFixture Magento/Framework/DB/_files/dummy_fixture.php
+     */
     public function testTransactionLevelDbIsolationDefault()
     {
         $resourceConnection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
             ->get(\Magento\Framework\App\ResourceConnection::class);
-        $this->assertEquals(0, $resourceConnection->getConnection('default')->getTransactionLevel());
+        $this->assertEquals(1, $resourceConnection->getConnection('default')->getTransactionLevel());
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Framework/DB/_files/dummy_fixture.php b/dev/tests/integration/testsuite/Magento/Framework/DB/_files/dummy_fixture.php
@@ -0,0 +1,8 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+//this fixture should not do anything
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Mview/View/ChangelogTest.php b/dev/tests/integration/testsuite/Magento/Framework/Mview/View/ChangelogTest.php
@@ -9,6 +9,8 @@
 
 /**
  * Test Class for \Magento\Framework\Mview\View\Changelog
+ *
+ * @magentoDbIsolation disabled
  */
 class ChangelogTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/dev/tests/integration/testsuite/Magento/Setup/Console/Command/GenerateFixturesCommandTest.php b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/GenerateFixturesCommandTest.php
@@ -16,7 +16,8 @@
 
 /**
  * Class GenerateFixturesCommandCommandTest
- * @package Magento\Setup\Console\Command
+ *
+ * @magentoDbIsolation disabled
  */
 class GenerateFixturesCommandTest extends \Magento\TestFramework\Indexer\TestCase
 {
diff --git a/dev/tests/integration/testsuite/Magento/Setup/Console/Command/PriceIndexerDimensionsModeSetCommandTest.php b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/PriceIndexerDimensionsModeSetCommandTest.php
@@ -13,6 +13,8 @@
 
 /**
  * Test command that sets indexer mode for catalog_product_price indexer
+ *
+ * @magentoDbIsolation disabled
  */
 class PriceIndexerDimensionsModeSetCommandTest extends \Magento\TestFramework\Indexer\TestCase
 {
diff --git a/dev/tests/integration/testsuite/Magento/Setup/Declaration/WhitelistDeclarationTest.php b/dev/tests/integration/testsuite/Magento/Setup/Declaration/WhitelistDeclarationTest.php
@@ -19,7 +19,9 @@
 use Magento\TestFramework\ObjectManager;
 
 /**
- * Class WhitelistDeclarationTest
+ * Checks whitelisted tables behaviour
+ *
+ * @magentoDbIsolation disabled
  */
 class WhitelistDeclarationTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/dev/tests/integration/testsuite/Magento/Setup/Fixtures/FixtureModelTest.php b/dev/tests/integration/testsuite/Magento/Setup/Fixtures/FixtureModelTest.php
@@ -13,6 +13,8 @@
 /**
  * Class Application test
  *
+ * @magentoDbIsolation disabled
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class FixtureModelTest extends \Magento\TestFramework\Indexer\TestCase
diff --git a/dev/tests/integration/testsuite/Magento/TestModuleOverrideConfig/MagentoConfigFixture/AddFixtureTest.php b/dev/tests/integration/testsuite/Magento/TestModuleOverrideConfig/MagentoConfigFixture/AddFixtureTest.php
@@ -31,6 +31,17 @@ protected function setUp(): void
         $this->config = $this->objectManager->get(ScopeConfigInterface::class);
     }
 
+    /**
+     * Checks that fixture added in global node successfully applied
+     *
+     * @return void
+     */
+    public function testGloballyAddFixture(): void
+    {
+        $value = $this->config->getValue('test_section/test_group/field_4', ScopeInterface::SCOPE_STORES);
+        $this->assertEquals('4th field globally overridden value', $value);
+    }
+
     /**
      * Checks that fixture added in test class node successfully applied
      *
diff --git a/dev/tests/integration/testsuite/Magento/TestModuleOverrideConfig/MagentoConfigFixture/ReplaceFixtureTest.php b/dev/tests/integration/testsuite/Magento/TestModuleOverrideConfig/MagentoConfigFixture/ReplaceFixtureTest.php
@@ -31,6 +31,19 @@ protected function setUp(): void
         $this->config = $this->objectManager->get(ScopeConfigInterface::class);
     }
 
+    /**
+     * Checks that fixture can be replaced in global node
+     *
+     * @magentoConfigFixture current_store test_section/test_group/field_5 new_value
+     *
+     * @return void
+     */
+    public function testGloballyReplaceFixture(): void
+    {
+        $value = $this->config->getValue('test_section/test_group/field_5', ScopeInterface::SCOPE_STORES);
+        $this->assertEquals('5th field globally replaced value', $value);
+    }
+
     /**
      * Checks that fixture can be replaced in test class node
      *
diff --git a/dev/tests/integration/testsuite/Magento/TestModuleOverrideConfig/MagentoDataFixture/SortFixturesTest.php b/dev/tests/integration/testsuite/Magento/TestModuleOverrideConfig/MagentoDataFixture/SortFixturesTest.php
@@ -27,6 +27,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
+        // phpstan:ignore "Class Magento\TestModuleOverrideConfig\Model\FixtureCallStorage not found."
         $this->fixtureCallStorage = $this->objectManager->get(FixtureCallStorage::class);
     }
 
@@ -61,6 +62,7 @@ public function sortFixturesProvider(): array
                     'fixture2_first_module.php',
                     'fixture1_third_module.php',
                     'fixture3_first_module.php',
+                    'global_fixture_first_module.php',// globally added fixture
                     'fixture2_second_module.php',
                 ],
             ],
@@ -70,6 +72,7 @@ public function sortFixturesProvider(): array
                     'fixture1_second_module.php',
                     'fixture2_first_module.php',
                     'fixture3_first_module.php',
+                    'global_fixture_first_module.php',// globally added fixture
                     'fixture2_second_module.php',
                 ],
             ],
diff --git a/dev/tests/integration/testsuite/Magento/TestModuleOverrideConfig/_files/global_fixture_first_module.php b/dev/tests/integration/testsuite/Magento/TestModuleOverrideConfig/_files/global_fixture_first_module.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestModuleOverrideConfig\Model\FixtureCallStorage;
+
+/** @var FixtureCallStorage $fixtureStorage */
+$fixtureStorage = Bootstrap::getObjectManager()->get(FixtureCallStorage::class);
+$fixtureStorage->addFixtureToStorage(basename(__FILE__));
diff --git a/dev/tests/integration/testsuite/Magento/TestModuleOverrideConfig/_files/global_fixture_first_module_rollback.php b/dev/tests/integration/testsuite/Magento/TestModuleOverrideConfig/_files/global_fixture_first_module_rollback.php
diff --git a/dev/tests/integration/testsuite/Magento/Theme/Model/DesignTest.php b/dev/tests/integration/testsuite/Magento/Theme/Model/DesignTest.php
diff --git a/dev/tests/integration/testsuite/Magento/Translation/Controller/AjaxTest.php b/dev/tests/integration/testsuite/Magento/Translation/Controller/AjaxTest.php

Original file line number	Diff line number	Diff line change
`@@ -203,6 +203,7 @@ private function getApplier(TestCase $test, string $fixtureType): ApplierInterfa`
`203`	`203`	`}`
`204`	`204`	`/** @var Base $applier */`
`205`	`205`	`$applier = $this->appliersList[$fixtureType];`
	`206`	`+ $applier->setGlobalConfig($this->config->getGlobalConfig($fixtureType));`
`206`	`207`	`$applier->setClassConfig($this->config->getClassConfig($test, $fixtureType));`
`207`	`208`	`$applier->setMethodConfig($this->config->getMethodConfig($test, $fixtureType));`
`208`	`209`	`$applier->setDataSetConfig(`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@`
`15`	`15`
`16`	`16`	`/**`
`17`	`17`	`* Test relation customization`
	`18`	`+ *`
	`19`	`+ * @magentoDbIsolation disabled`
`18`	`20`	`*/`
`19`	`21`	`class RelationTest extends \Magento\TestFramework\Indexer\TestCase`
`20`	`22`	`{`