merge magento/2.3.0-release into magento-honey-badgers/bug_fixes_beta_bugs

Author: Magento CICD

dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest.xml

@@ -77,6 +77,7 @@
             <data name="createProduct" xsi:type="string">downloadable</data>
             <data name="product" xsi:type="string">configurableProduct::not_virtual_for_type_switching</data>
             <data name="actionName" xsi:type="string">clearDownloadableData</data>
+            <data name="issue" xsi:type="string">MSI-1624</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
             <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertChildProductsInGrid" />

dev/tests/integration/testsuite/Magento/CatalogInventory/Model/Quote/Item/QuantityValidatorTest.php

@@ -170,7 +170,7 @@ private function setMockStockStateResultToQuoteItemOptions($quoteItem, $resultMo
      * Tests quantity verifications for configurable product.
      *
      * @param int $quantity - quantity of configurable option.
-     * @param string $errorMessage - expected error message.
+     * @param string $errorMessageRegexp - expected error message regexp.
      * @return void
      * @throws CouldNotSaveException
      * @throws LocalizedException
@@ -179,7 +179,7 @@ private function setMockStockStateResultToQuoteItemOptions($quoteItem, $resultMo
      * @magentoDbIsolation enabled
      * @magentoAppIsolation enabled
      */
-    public function testConfigurableWithOptions(int $quantity, string $errorMessage): void
+    public function testConfigurableWithOptions(int $quantity, string $errorMessageRegexp): void
     {
         /** @var ProductRepositoryInterface $productRepository */
         $productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
@@ -217,17 +217,16 @@ public function testConfigurableWithOptions(int $quantity, string $errorMessage)
             ]
         );
 
-        if (!empty($errorMessage)) {
-            $this->expectException(LocalizedException::class);
-            $this->expectExceptionMessage($errorMessage);
-        }
-
-        /** @var Quote $cart */
-        $cart = $this->objectManager->create(CartInterface::class);
-        $result = $cart->addProduct($product, $request);
+        try {
+            /** @var Quote $cart */
+            $cart = $this->objectManager->create(CartInterface::class);
+            $result = $cart->addProduct($product, $request);
 
-        if (empty($errorMessage)) {
-            self::assertEquals('Configurable Product', $result->getName());
+            if (empty($errorMessageRegexp)) {
+                self::assertEquals('Configurable Product', $result->getName());
+            }
+        } catch (LocalizedException $e) {
+            self::assertEquals(1, preg_match($errorMessageRegexp, $e->getMessage()));
         }
     }
 
@@ -239,18 +238,20 @@ public function testConfigurableWithOptions(int $quantity, string $errorMessage)
      */
     public function quantityDataProvider(): array
     {
+        $qtyRegexp = '/You can buy (this product|Configurable OptionOption 1) only in quantities of 500 at a time/';
+
         return [
             [
                 'quantity' => 1,
-                'error' => 'The fewest you may purchase is 500.'
+                'error_regexp' => '/The fewest you may purchase is 500/'
             ],
             [
                 'quantity' => 501,
-                'error' => 'You can buy Configurable OptionOption 1 only in quantities of 500 at a time'
+                'error_regexp' => $qtyRegexp
             ],
             [
                 'quantity' => 1000,
-                'error' => ''
+                'error_regexp' => ''
             ],
 
         ];

dev/tests/static/framework/Magento/ruleset.xml

@@ -30,18 +30,21 @@
         <exclude-pattern>*/_files/*</exclude-pattern>
         <exclude-pattern>*/Test/*</exclude-pattern>
         <exclude-pattern>*Test.php</exclude-pattern>
+        <exclude-pattern>*/Magento/Inventory*/*</exclude-pattern>
     </rule>
     <rule ref="Magento.Annotation.MethodAnnotationStructure">
         <include-pattern>*\.(php)</include-pattern>
         <exclude-pattern>*/Test/*</exclude-pattern>
         <exclude-pattern>*Test.php</exclude-pattern>
         <exclude-pattern>*/_files/*</exclude-pattern>
+        <exclude-pattern>*/Magento/Inventory*/*</exclude-pattern>
     </rule>
     <rule ref="Magento.Annotation.ClassAnnotationStructure">
         <include-pattern>*\.(php)</include-pattern>
         <exclude-pattern>*/Test/*</exclude-pattern>
         <exclude-pattern>*Test.php</exclude-pattern>
         <exclude-pattern>*/_files/*</exclude-pattern>
+        <exclude-pattern>*/Magento/Inventory*/*</exclude-pattern>
     </rule>
     <rule ref="Magento.Functions.OutputBuffering">
         <include-pattern>*/(app/code|vendor|setup/src|lib/internal/Magento)/*</include-pattern>

dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt

@@ -202,3 +202,6 @@ setup/performance-toolkit/aggregate-report
 Magento/MessageQueue/Setup
 Magento/Elasticsearch/Elasticsearch5
 Test/_files
+Magento/InventoryCatalogAdminUi/Controller/Adminhtml
+Magento/InventoryConfigurableProductIndexer/Indexer
+Magento/InventoryGroupedProductIndexer/Indexer