MTO-134: [Variation] Add Simple Product with required Custom Options to Cart

- Defects fixed

Author: vitalysery

dev/tests/functional/tests/app/Magento/Backend/Test/Block/Messages.php

@@ -21,13 +21,6 @@ class Messages extends Block
      */
     protected $successMessage = '[data-ui-id$=message-success]';
 
-    /**
-     * Selector for "This is a required field." validation error message.
-     *
-     * @var string
-     */
-    private $validationErrorMessage = '//div[@class="mage-error"][contains(text(), "This is required field")]';
-
     /**
      * Last success message selector.
      *
@@ -73,18 +66,6 @@ public function waitSuccessMessage()
         return $this->waitForElementVisible($this->successMessage, Locator::SELECTOR_CSS);
     }
 
-    /**
-     * Wait for success or JS validation error message.
-     *
-     * @return bool
-     */
-    public function waitMessage()
-    {
-        return $this->_rootElement->find($this->successMessage, Locator::SELECTOR_CSS)->isVisible() ?
-            $this->waitForElementVisible($this->successMessage, Locator::SELECTOR_CSS) :
-            $this->waitForElementVisible($this->validationErrorMessage, Locator::SELECTOR_XPATH);
-    }
-
     /**
      * Get all success messages which are present on the page.
      *

dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Messages.php

@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Test\Block;
+
+use Magento\Mtf\Client\Locator;
+
+/**
+ * Catalog messages block.
+ */
+class Messages extends \Magento\Backend\Test\Block\Messages
+{
+    /**
+     * Selector for "This is a required field." validation error message.
+     *
+     * @var string
+     */
+    private $validationErrorMessage = '.mage-error';
+
+    /**
+     * Wait for Success message or JS validation error message.
+     *
+     * @param string $strategy
+     * @return bool
+     */
+    public function waitMessage($strategy = Locator::SELECTOR_CSS)
+    {
+        $browser = $this->browser;
+        $successMessage = $this->successMessage;
+        $errorMessage = $this->validationErrorMessage;
+        return $browser->waitUntil(
+            function () use ($browser, $successMessage, $errorMessage, $strategy) {
+                $success = $browser->find($successMessage, $strategy);
+                $error = $browser->find($errorMessage, $strategy);
+                return $success->isVisible() || $error->isVisible() ? true : null;
+            }
+        );
+    }
+}

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

@@ -188,12 +188,12 @@ protected function getListOptions()
     }
 
     /**
-     * Check that validation error message beside custom option is visible.
+     * Check option's validation message is visible or not.
      *
      * @param string $customOptionTitle
      * @return bool
      */
-    public function validationErrorMessageIsVisible($customOptionTitle)
+    public function isValidationErrorMessageVisible($customOptionTitle)
     {
         $optionSelector = $this->customOptionField . $this->requiredOption . $this->validationErrorMessage;
         $title = sprintf($optionSelector, $customOptionTitle);

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

@@ -10,12 +10,12 @@
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 
 /**
- * Assert that JS validation error message is visible beside every required product option.
+ * Assert that every required product's Custom Option contains JS validation error.
  */
 class AssertProductCustomOptionsErrors extends AbstractConstraint
 {
     /**
-     * Assert that JS validation error message is visible beside every required product option.
+     * Assert that every required product's Custom Option contains JS validation error.
      *
      * @param CatalogProductView $catalogProductView
      * @param array $products
@@ -28,20 +28,20 @@ public function processAssert(
         foreach ($products as $product) {
             foreach ($product->getData('custom_options') as $option) {
                 \PHPUnit_Framework_Assert::assertTrue(
-                    $catalogProductView->getCustomOptionsBlock()->validationErrorMessageIsVisible($option['title']),
-                    'JS validation error message is absent after required product option ' . $option['title']
+                    $catalogProductView->getCustomOptionsBlock()->isValidationErrorMessageVisible($option['title']),
+                    'Required Custom Option ' . $option['title'] . " doesn't contain JS validation error."
                 );
             }
         }
     }
 
     /**
-     * Assert success message that JS validation error message is visible beside every required product option.
+     * Assert success message that every required product's Custom Option contains JS validation error.
      *
      * @return string
      */
     public function toString()
     {
-        return 'JS validation error message is visible beside every required product option.';
+        return "Every required product's Custom Option contains JS validation error.";
     }
 }

dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Product/CatalogProductView.xml

@@ -14,7 +14,7 @@
         <block name="upsellBlock" class="Magento\Catalog\Test\Block\Product\ProductList\Upsell" locator=".block.upsell" strategy="css selector" />
         <block name="crosssellBlock" class="Magento\Catalog\Test\Block\Product\ProductList\Crosssell" locator=".block.crosssell" strategy="css selector" />
         <block name="downloadableLinksBlock" class="Magento\Downloadable\Test\Block\Catalog\Product\View\Links" locator="[data-container-for=downloadable-links]" strategy="css selector" />
-        <block name="messagesBlock" class="Magento\Backend\Test\Block\Messages" locator=".page.messages" strategy="css selector" />
+        <block name="messagesBlock" class="Magento\Catalog\Test\Block\Messages" locator=".page.messages" strategy="css selector" />
         <block name="titleBlock" class="Magento\Theme\Test\Block\Html\Title" locator=".page-title-wrapper h1.page-title .base" strategy="css selector" />
         <block name="widgetView" class="Magento\Widget\Test\Block\WidgetView" locator=".column.main .widget" strategy="css selector" />
     </page>