Merge remote-tracking branch 'mainline/2.3-develop' into MAGETWO-81530-support-all-product-types

Author: cpartica

dev/tests/integration/testsuite/Magento/SalesRule/Model/Rule/Condition/ProductTest.php

@@ -28,12 +28,14 @@ protected function setUp()
      * @magentoAppIsolation enabled
      * @param int $categoryId
      * @param bool $expectedResult
-     * @magentoDataFixture Magento/ConfigurableProduct/_files/quote_with_configurable_product.php
-     * @magentoDataFixture Magento/SalesRule/_files/rules_category.php
      * @dataProvider validateProductConditionDataProvider
      */
     public function testValidateCategorySalesRuleIncludesChildren($categoryId, $expectedResult)
     {
+        //* @magentoDataFixture Magento/ConfigurableProduct/_files/quote_with_configurable_product.php
+        //* @magentoDataFixture Magento/SalesRule/_files/rules_category.php
+        $this->markTestSkipped('MAGETWO-87436');
+
         // Load the quote that contains a child of a configurable product
         /** @var \Magento\Quote\Model\Quote  $quote */
         $quote = $this->objectManager->create(\Magento\Quote\Model\Quote::class)

dev/tests/static/phpunit-all.xml.dist

@@ -20,5 +20,7 @@
     </testsuites>
     <php>
         <ini name="date.timezone" value="America/Los_Angeles"/>
+        <!-- TESTCODESTYLE_IS_FULL_SCAN - specify if full scan should be performed for test code style test -->
+        <const name="TESTCODESTYLE_IS_FULL_SCAN" value="1"/>
     </php>
 </phpunit>

dev/tests/static/phpunit.xml.dist

@@ -30,6 +30,7 @@
     </testsuites>
     <php>
         <ini name="date.timezone" value="America/Los_Angeles"/>
+        <!-- TESTCODESTYLE_IS_FULL_SCAN - specify if full scan should be performed for test code style test -->
         <const name="TESTCODESTYLE_IS_FULL_SCAN" value="1"/>
         <!-- TESTS_COMPOSER_PATH - specify the path to composer binary, if a relative reference cannot be resolved -->
         <!--<const name="TESTS_COMPOSER_PATH" value="/usr/local/bin/composer"/>-->

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

@@ -199,13 +199,11 @@ private function getFullWhitelist()
 
     public function testCodeStyle()
     {
-        $whiteList = defined('TESTCODESTYLE_IS_FULL_SCAN') && TESTCODESTYLE_IS_FULL_SCAN === '1'
-            ? $this->getFullWhitelist() : self::getWhitelist(['php', 'phtml']);
-
+        $isFullScan = defined('TESTCODESTYLE_IS_FULL_SCAN') && TESTCODESTYLE_IS_FULL_SCAN === '1';
         $reportFile = self::$reportDir . '/phpcs_report.txt';
         $codeSniffer = new CodeSniffer('Magento', $reportFile, new Wrapper());
-        $result = $codeSniffer->run($whiteList);
-        $report = file_exists($reportFile) ? file_get_contents($reportFile) : '';
+        $result = $codeSniffer->run($isFullScan ? $this->getFullWhitelist() : self::getWhitelist(['php', 'phtml']));
+        $report = file_get_contents($reportFile);
         $this->assertEquals(
             0,
             $result,