MTO-136: [Test] Captcha on Contact Us form

- Defects fixed.

Author: SiarheiAndreyeu

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

@@ -56,13 +56,6 @@ class Messages extends Block
      */
     protected $warningMessage = '[data-ui-id$=message-warning]';
 
-    /**
-     * Selector for "This is a required field." validation error message.
-     *
-     * @var string
-     */
-    private $validationErrorMessage = '.mage-error';
-
     /**
      * Wait for success message.
      *
@@ -73,16 +66,6 @@ public function waitSuccessMessage()
         return $this->waitForElementVisible($this->successMessage, Locator::SELECTOR_CSS);
     }
 
-    /**
-     * Wait for error message.
-     *
-     * @return bool
-     */
-    public function waitValidationErrorMessage()
-    {
-        return $this->waitForElementVisible($this->validationErrorMessage, Locator::SELECTOR_CSS);
-    }
-
     /**
      * Get all success messages which are present on the page.
      *

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

@@ -170,6 +170,16 @@ public function getOptions(FixtureInterface $product)
         return ['custom_options' => $result];
     }
 
+    /**
+     * Wait for error message.
+     *
+     * @return bool
+     */
+    public function waitValidationErrorMessage()
+    {
+        return $this->waitForElementVisible($this->validationErrorMessage, Locator::SELECTOR_XPATH);
+    }
+
     /**
      * Get list custom options
      *

dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/MoveCategoryEntityTest.php

@@ -118,8 +118,8 @@ public function test(
      * Get moved category tree.
      *
      * @param Category $movedCategory
-     * @param Category $childCategory
      * @param Category $parentCategory
+     * @param Category $childCategory
      * @return Category
      */
     public function getMovedCategoryTree(Category $movedCategory, Category $parentCategory, Category $childCategory)

dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.php

@@ -159,8 +159,7 @@ public function test(
         $products = $this->prepareProducts($productsData);
 
         // Steps
-        $this->addToCart($products);
-        $this->waitAddToCartMessage($isValidationFailed);
+        $this->addToCart($products, $isValidationFailed);
 
         $cart['data']['items'] = ['products' => $products];
         return [
@@ -190,32 +189,18 @@ protected function prepareProducts(array $productList)
      * Add products to cart.
      *
      * @param array $products
+     * @param bool $isValidationFailed
      * @return void
      */
-    protected function addToCart(array $products)
+    protected function addToCart(array $products, $isValidationFailed)
     {
         $addToCartStep = $this->testStepFactory->create(
             \Magento\Checkout\Test\TestStep\AddProductsToTheCartStep::class,
-            ['products' => $products]
+            ['products' => $products, 'isValidationFailed' => $isValidationFailed]
         );
         $addToCartStep->run();
     }
 
-    /**
-     * Wait message after add product to cart.
-     *
-     * @param bool $isValidationFailed
-     * @return void
-     */
-    private function waitAddToCartMessage($isValidationFailed)
-    {
-        if ($isValidationFailed) {
-            $this->catalogProductView->getMessagesBlock()->waitValidationErrorMessage();
-        } else {
-            $this->catalogProductView->getMessagesBlock()->waitSuccessMessage();
-        }
-    }
-
     /**
      * Clean data after running test.
      *

dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/AddProductsToTheCartStep.php

@@ -67,28 +67,38 @@ class AddProductsToTheCartStep implements TestStepInterface
      */
     private $loadingSelector = '.loading-mask';
 
+    /**
+     * Flag for validation result after add product to cart.
+     *
+     * @var bool
+     */
+    private $isValidationFailed;
+
     /**
      * @param CatalogProductView $catalogProductView
      * @param CheckoutCart $checkoutCart
      * @param CmsIndex $cmsIndex
      * @param BrowserInterface $browser
      * @param FixtureFactory $fixtureFactory
      * @param array $products
+     * @param bool $isValidationFailed
      */
     public function __construct(
         CatalogProductView $catalogProductView,
         CheckoutCart $checkoutCart,
         CmsIndex $cmsIndex,
         BrowserInterface $browser,
         FixtureFactory $fixtureFactory,
-        array $products
+        array $products,
+        $isValidationFailed = false
     ) {
         $this->catalogProductView = $catalogProductView;
         $this->checkoutCart = $checkoutCart;
         $this->cmsIndex = $cmsIndex;
         $this->browser = $browser;
         $this->fixtureFactory = $fixtureFactory;
         $this->products = $products;
+        $this->isValidationFailed = $isValidationFailed;
     }
 
     /**
@@ -105,6 +115,12 @@ public function run()
             $this->browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
             $this->catalogProductView->getViewBlock()->waitForElementNotVisible($this->loadingSelector);
             $this->catalogProductView->getViewBlock()->addToCart($product);
+
+            if ($this->isValidationFailed) {
+                $this->catalogProductView->getCustomOptionsBlock()->waitValidationErrorMessage();
+            } else {
+                $this->catalogProductView->getMessagesBlock()->waitSuccessMessage();
+            }
         }
         $cart['data']['items'] = ['products' => $this->products];
         return ['cart' => $this->fixtureFactory->createByCode('cart', $cart)];

dev/tests/functional/tests/app/Magento/Contact/Test/Fixture/Comment/Customer.php

@@ -8,7 +8,7 @@
 
 use Magento\Mtf\Fixture\DataSource;
 use Magento\Mtf\Fixture\FixtureFactory;
-use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Customer\Test\Fixture\Customer as CustomerFixture;
 
 /**
  * Customer comment on contact page.
@@ -18,7 +18,7 @@ class Customer extends DataSource
     /**
      * Customer Fixture.
      *
-     * @var FixtureInterface
+     * @var CustomerFixture
      */
     private $customer;
 
@@ -29,13 +29,6 @@ class Customer extends DataSource
      */
     private $fixtureFactory;
 
-    /**
-     * Rought fixture field data.
-     *
-     * @var array
-     */
-    private $fixtureData = null;
-
     /**
      * @param FixtureFactory $fixtureFactory
      * @param array $params
@@ -48,7 +41,6 @@ public function __construct(
     ) {
         $this->fixtureFactory = $fixtureFactory;
         $this->params = $params;
-        $this->fixtureData = $data;
         $this->data = $data;
     }
 
@@ -61,12 +53,13 @@ public function __construct(
      */
     public function getData($key = null)
     {
-        if (empty($this->fixtureData)) {
+        if (empty($this->data)) {
             throw new \Exception("Data must be set");
         }
 
-        if (isset($this->fixtureData['dataset']) && !$this->customer) {
-            $customer = $this->fixtureFactory->createByCode('customer', $this->fixtureData);
+        if (isset($this->data['dataset']) && !$this->customer) {
+            /** @var CustomerFixture $customer */
+            $customer = $this->fixtureFactory->createByCode('customer', $this->data);
 
             if (!$customer->getId()) {
                 $customer->persist();
@@ -76,9 +69,8 @@ public function getData($key = null)
             $this->data = [
                 'firstname' => $customer->getFirstname(),
                 'email' => $customer->getEmail(),
-                'telephone' => $customer->getEmail()
+                'telephone' => $customer->hasData('telephone') ? $customer->getData('telephone') : ''
             ];
-
         }
 
         return parent::getData($key);
@@ -87,7 +79,7 @@ public function getData($key = null)
     /**
      * Return customer.
      *
-     * @return FixtureInterface
+     * @return CustomerFixture
      */
     public function getCustomer()
     {