Merge remote-tracking branch 'origin/MC-5274' into 2.3-develop-mftf-pr16

Author: dmitriyprime

dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View.php

@@ -220,6 +220,13 @@ class View extends AbstractConfigureBlock
      */
     private $thresholdMessage = '.availability.only';
 
+    /**
+     * Qty field error message selector.
+     *
+     * @var string
+     */
+    private $qtyErrorMessage = '#qty-error';
+
     /**
      * Checks if threshold message is displayed.
      *
@@ -677,4 +684,16 @@ public function checkVideoDataPresence($videoData)
         $dataVideoSelector = $this->productVideo . '[data-code="' . $videoData. '"]';
         return $this->_rootElement->find($dataVideoSelector)->isPresent();
     }
+
+    /**
+     * Resolve qty field error message.
+     *
+     * @return string
+     */
+    public function getQtyErrorMessage()
+    {
+        $this->waitForElementVisible($this->qtyErrorMessage);
+
+        return $this->_rootElement->find($this->qtyErrorMessage)->getText();
+    }
 }

dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInventoryMaxAllowedQty.php

@@ -22,7 +22,7 @@ class AssertProductInventoryMaxAllowedQty extends AbstractConstraint
      *
      * @var string
      */
-    private $errorMessage = 'The most you may purchase is %s.';
+    private $errorMessage = 'The maximum you may purchase is %s.';
 
     /**
      * Check if max qty setting is working correctly.
@@ -48,8 +48,8 @@ public function processAssert(
         $catalogProductView->getViewBlock()->waitLoader();
         $catalogProductView->getViewBlock()->setQtyAndClickAddToCart($maxQty * 2);
         \PHPUnit\Framework\Assert::assertEquals(
-            $catalogProductView->getMessagesBlock()->getErrorMessage(),
             sprintf($this->errorMessage, $maxQty),
+            $catalogProductView->getViewBlock()->getQtyErrorMessage(),
             'The maximum purchase warning message is not appears.'
         );
 

dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInventoryMinAllowedQty.php

@@ -48,8 +48,8 @@ public function processAssert(
         $catalogProductView->getViewBlock()->waitLoader();
         $catalogProductView->getViewBlock()->setQtyAndClickAddToCart(1);
         \PHPUnit\Framework\Assert::assertEquals(
-            $catalogProductView->getMessagesBlock()->getErrorMessage(),
             sprintf($this->errorMessage, $minQty),
+            $catalogProductView->getViewBlock()->getQtyErrorMessage(),
             'The minimum purchase warning message is not appears.'
         );
 

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

@@ -8,7 +8,6 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Catalog\Test\TestCase\Product\CreateSimpleProductEntityPartOneTest" summary="Create Simple Product" ticketId="MAGETWO-23414">
         <variation name="CreateSimpleProductEntityTestVariation12" summary="Create product that visible only in search and check min/max qty allowed in the shopping cart" ticketId="MAGETWO-43376, MAGETWO-43359">
-            <data name="issue" xsi:type="string">MAGETWO-63217: Error message doesn't appear on add in the cart less products than configured</data>
             <data name="configData" xsi:type="string">inventory_min_qty_3, inventory_max_qty_5</data>
             <data name="product/data/url_key" xsi:type="string">simple-product-%isolation%</data>
             <data name="product/data/name" xsi:type="string">Simple Product %isolation%</data>