Deliver catalog storefront tests changes to mainline

Author: le0n4ik

dev/tests/api-functional/testsuite/Magento/Webapi/JoinDirectivesTest.php

@@ -50,6 +50,7 @@ protected function setUp(): void
      *
      * @magentoApiDataFixture Magento/SalesRule/_files/rules_rollback.php
      * @magentoApiDataFixture Magento/Sales/_files/quote.php
+     * @magentoAppIsolation enabled
      */
     public function testGetList()
     {
@@ -87,6 +88,7 @@ public function testGetList()
 
     /**
      * @magentoApiDataFixture Magento/Sales/_files/invoice.php
+     * @magentoAppIsolation enabled
      */
     public function testAutoGeneratedGetList()
     {
@@ -131,6 +133,7 @@ public function testAutoGeneratedGetList()
      * Test get list of orders with extension attributes.
      *
      * @magentoApiDataFixture Magento/Sales/_files/order.php
+     * @magentoAppIsolation enabled
      */
     public function testGetOrdertList()
     {

dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractBackendController.php

@@ -63,7 +63,9 @@ protected function setUp(): void
          * If it will be created on test bootstrap we will have invalid RoleLocator object.
          * As tests by default are run not from adminhtml area...
          */
-        \Magento\TestFramework\ObjectManager::getInstance()->removeSharedInstance(\Magento\Framework\Authorization::class);
+        \Magento\TestFramework\ObjectManager::getInstance()->removeSharedInstance(
+            \Magento\Framework\Authorization::class
+        );
         $this->_auth = $this->_objectManager->get(\Magento\Backend\Model\Auth::class);
         $this->_session = $this->_auth->getAuthStorage();
         $credentials = $this->_getAdminCredentials();

dev/tests/integration/testsuite/Magento/Sales/_files/quote.php

@@ -3,7 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 \Magento\TestFramework\Helper\Bootstrap::getInstance()->loadArea('frontend');
+
+$storeManager = Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->get(\Magento\Store\Model\StoreManagerInterface::class);
 $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
 $product->setTypeId('simple')
     ->setId(1)
@@ -23,7 +27,9 @@
             'is_in_stock' => 1,
             'manage_stock' => 1,
         ]
-    )->save();
+    )
+    ->setWebsiteIds([$storeManager->getStore()->getWebsiteId()])
+    ->save();
 
 $productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
     ->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
@@ -39,9 +45,7 @@
 $shippingAddress = clone $billingAddress;
 $shippingAddress->setId(null)->setAddressType('shipping');
 
-$store = Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-    ->get(\Magento\Store\Model\StoreManagerInterface::class)
-    ->getStore();
+$store = $storeManager->getStore();
 
 /** @var \Magento\Quote\Model\Quote $quote */
 $quote = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Quote\Model\Quote::class);

dev/tests/static/framework/Magento/TestFramework/Dependency/DbRule.php

@@ -7,6 +7,9 @@
  */
 namespace Magento\TestFramework\Dependency;
 
+/**
+ * Class to get DB dependencies information
+ */
 class DbRule implements \Magento\TestFramework\Dependency\RuleInterface
 {
     /**
@@ -37,7 +40,7 @@ public function __construct(array $tables)
      */
     public function getDependencyInfo($currentModule, $fileType, $file, &$contents)
     {
-        if ('php' != $fileType || !preg_match('#.*/(Setup|Resource)/.*\.php$#', $file)) {
+        if ('php' !== $fileType || !preg_match('#.*/(Setup|Resource|Query)/.*\.php$#', $file)) {
             return [];
         }
 

dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php

@@ -326,9 +326,19 @@ public function testCodeStyle()
             touch($reportFile);
         }
         $codeSniffer = new CodeSniffer('Magento', $reportFile, new Wrapper());
-        $result = $codeSniffer->run(
-            $this->isFullScan() ? $this->getFullWhitelist() : self::getWhitelist(['php', 'phtml'])
-        );
+        $fileList = $this->isFullScan() ? $this->getFullWhitelist() : self::getWhitelist(['php', 'phtml']);
+        $ignoreList = Files::init()->readLists(__DIR__ . '/_files/phpcs/ignorelist/*.txt');
+        if ($ignoreList) {
+            $ignoreListPattern = sprintf('#(%s)#i', implode('|', $ignoreList));
+            $fileList = array_filter(
+                $fileList,
+                function ($path) use ($ignoreListPattern) {
+                    return !preg_match($ignoreListPattern, $path);
+                }
+            );
+        }
+
+        $result = $codeSniffer->run($fileList);
         $report = file_get_contents($reportFile);
         $this->assertEquals(
             0,
@@ -348,8 +358,19 @@ public function testCodeMess()
         if (!$codeMessDetector->canRun()) {
             $this->markTestSkipped('PHP Mess Detector is not available.');
         }
+        $fileList = self::getWhitelist(['php']);
+        $ignoreList = Files::init()->readLists(__DIR__ . '/_files/phpmd/ignorelist/*.txt');
+        if ($ignoreList) {
+            $ignoreListPattern = sprintf('#(%s)#i', implode('|', $ignoreList));
+            $fileList = array_filter(
+                $fileList,
+                function ($path) use ($ignoreListPattern) {
+                    return !preg_match($ignoreListPattern, $path);
+                }
+            );
+        }
 
-        $result = $codeMessDetector->run(self::getWhitelist(['php']));
+        $result = $codeMessDetector->run($fileList);
 
         $output = "";
         if (file_exists($reportFile)) {