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

SiarheiAndreyeu · SiarheiAndreyeu · commit 0dbd073c9d56 · 2017-03-03T14:11:22.000+03:00
- Stabilization.
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Messages.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Messages.php
@@ -56,6 +56,13 @@ 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.
      *
@@ -66,6 +73,16 @@ 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.
      *
diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/Block/Form/ContactUs.php b/dev/tests/functional/tests/app/Magento/Captcha/Test/Block/Form/ContactUs.php
@@ -6,23 +6,14 @@
 
 namespace Magento\Captcha\Test\Block\Form;
 
-use Magento\Mtf\Block\Form;
 use Magento\Mtf\Client\Locator;
-use Magento\Mtf\Fixture\FixtureInterface;
-use Magento\Mtf\Client\Element\SimpleElement;
+use Magento\Contact\Test\Block\Form\ContactUs as ContactForm;
 
 /**
  * Form for "Contact Us" page with captcha.
  */
-class ContactUsFormWithCaptcha extends Form
+class ContactUs extends ContactForm
 {
-    /**
-     * Submit form button.
-     *
-     * @var string
-     */
-    private $submit = '.action.submit';
-
     /**
      * Captcha image selector.
      *
@@ -66,32 +57,4 @@ public function reloadCaptcha()
     {
         $this->_rootElement->find($this->captchaReload, Locator::SELECTOR_CSS)->click();
     }
-
-    /**
-     * Click submit button.
-     *
-     * @return void
-     */
-    public function sendComment()
-    {
-        $this->_rootElement->find($this->submit, Locator::SELECTOR_CSS)->click();
-    }
-
-    /**
-     * Fill the contact us form.
-     *
-     * @param FixtureInterface $fixture
-     * @param SimpleElement|null $element
-     * @return $this
-     */
-    public function fill(FixtureInterface $fixture, SimpleElement $element = null)
-    {
-        $data = $fixture->getData();
-        $data['firstname'] = $data['customer']['firstname'];
-        $data['email'] = $data['customer']['email'];
-        unset($data['customer']);
-        $this->_fill($this->dataMapping($data), $element);
-
-        return $this;
-    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/Block/Form/ContactUs.xml b/dev/tests/functional/tests/app/Magento/Captcha/Test/Block/Form/ContactUs.xml
@@ -7,14 +7,6 @@
 -->
 <mapping strict="0">
     <fields>
-        <firstname>
-            <selector>input[name*=name]</selector>
-        </firstname>
-        <email />
-        <telephone />
-        <comment>
-            <selector>#comment</selector>
-        </comment>
         <captcha>
             <selector>[name='captcha[contact_us]']</selector>
         </captcha>
diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/Block/Form/LoginWithCaptcha.php b/dev/tests/functional/tests/app/Magento/Captcha/Test/Block/Form/LoginWithCaptcha.php
@@ -8,7 +8,6 @@
 
 use Magento\Mtf\Client\Locator;
 use Magento\Customer\Test\Block\Form\Login;
-use Magento\Mtf\Client\ElementInterface;
 
 /**
  * Form for storefront login with captcha.
diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/Block/Form/Register.php b/dev/tests/functional/tests/app/Magento/Captcha/Test/Block/Form/Register.php
@@ -7,12 +7,12 @@
 namespace Magento\Captcha\Test\Block\Form;
 
 use Magento\Mtf\Client\Locator;
-use Magento\Customer\Test\Block\Form\Register;
+use Magento\Customer\Test\Block\Form\Register as CustomerRegister;
 
 /**
  * Form for storefront register customer with captcha.
  */
-class RegisterFormWithCaptcha extends Register
+class Register extends CustomerRegister
 {
     /**
      * Captcha image selector.
diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/Block/Form/Register.xml b/dev/tests/functional/tests/app/Magento/Captcha/Test/Block/Form/Register.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" ?>
+<!--
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<mapping strict="0">
+    <fields>
+        <captcha>
+            <selector>[name='captcha[user_create]']</selector>
+        </captcha>
+    </fields>
+</mapping>
diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/Block/Form/RegisterFormWithCaptcha.xml b/dev/tests/functional/tests/app/Magento/Captcha/Test/Block/Form/RegisterFormWithCaptcha.xml
diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/Constraint/AssertCaptchaFieldOnContactUsForm.php b/dev/tests/functional/tests/app/Magento/Captcha/Test/Constraint/AssertCaptchaFieldOnContactUsForm.php
@@ -23,12 +23,12 @@ class AssertCaptchaFieldOnContactUsForm extends AbstractConstraint
     public function processAssertRegisterForm(ContactIndex $contactIndex)
     {
         \PHPUnit_Framework_Assert::assertTrue(
-            $contactIndex->getFormWithCaptcha()->isVisibleCaptcha(),
+            $contactIndex->getContactUs()->isVisibleCaptcha(),
             'Captcha image is not displayed on the Contact Us page.'
         );
 
         \PHPUnit_Framework_Assert::assertTrue(
-            $contactIndex->getFormWithCaptcha()->isVisibleCaptchaReloadButton(),
+            $contactIndex->getContactUs()->isVisibleCaptchaReloadButton(),
             'Captcha reload button is not displayed on the Contact Us page.'
         );
     }
diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/Constraint/AssertCaptchaFieldOnRegisterForm.php b/dev/tests/functional/tests/app/Magento/Captcha/Test/Constraint/AssertCaptchaFieldOnRegisterForm.php
@@ -23,12 +23,12 @@ class AssertCaptchaFieldOnRegisterForm extends AbstractConstraint
     public function processAssertRegisterForm(CustomerAccountCreate $createAccountPage)
     {
         \PHPUnit_Framework_Assert::assertTrue(
-            $createAccountPage->getRegisterFormWithCaptcha()->isVisibleCaptcha(),
+            $createAccountPage->getRegisterForm()->isVisibleCaptcha(),
             'Captcha image is not displayed on the storefront account register page.'
         );
 
         \PHPUnit_Framework_Assert::assertTrue(
-            $createAccountPage->getRegisterFormWithCaptcha()->isVisibleCaptchaReloadButton(),
+            $createAccountPage->getRegisterForm()->isVisibleCaptchaReloadButton(),
             'Captcha reload button is not displayed on the storefront account register page.'
         );
     }
diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/Page/ContactIndex.xml b/dev/tests/functional/tests/app/Magento/Captcha/Test/Page/ContactIndex.xml
@@ -7,6 +7,6 @@
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/pages.xsd">
     <page name="ContactIndex" mca="contact/index/index" module="Magento_Contact">
-        <block name="formWithCaptcha" class="Magento\Captcha\Test\Block\Form\ContactUsFormWithCaptcha" locator="#contact-form" strategy="css selector"/>
+        <block name="contactUs" class="Magento\Captcha\Test\Block\Form\ContactUs" locator="#contact-form" strategy="css selector" />
     </page>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/Page/CustomerAccountCreate.xml b/dev/tests/functional/tests/app/Magento/Captcha/Test/Page/CustomerAccountCreate.xml
@@ -7,6 +7,6 @@
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/pages.xsd">
     <page name="CustomerAccountCreate" mca="customer/account/create">
-        <block name="registerFormWithCaptcha" class="Magento\Captcha\Test\Block\Form\RegisterFormWithCaptcha" locator="#form-validate[novalidate='novalidate']" strategy="css selector"/>
+        <block name="registerForm" class="Magento\Captcha\Test\Block\Form\Register" locator="#form-validate[novalidate='novalidate']" strategy="css selector" />
     </page>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaLockoutCustomerTest.php b/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaLockoutCustomerTest.php
@@ -31,7 +31,7 @@
  * @group Captcha
  * @ZephyrId MAGETWO-49048
  */
-class CaptchaAndLockoutCustomerTest extends Injectable
+class CaptchaLockoutCustomerTest extends Injectable
 {
     /**
      * Step factory.
diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaLockoutCustomerTest.xml b/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaLockoutCustomerTest.xml
@@ -6,8 +6,8 @@
  */
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-    <testCase name="Magento\Captcha\Test\TestCase\CaptchaAndLockoutCustomerTest" summary="Captcha and Lockout for Storefront Login Page" ticketId="MAGETWO-49048">
-        <variation name="CaptchaAndLockoutCustomerTestVariation1">
+    <testCase name="Magento\Captcha\Test\TestCase\CaptchaLockoutCustomerTest" summary="Captcha and Lockout for Storefront Login Page" ticketId="MAGETWO-49048">
+        <variation name="CaptchaLockoutCustomerTestVariation1">
             <data name="customer/dataset" xsi:type="string">default</data>
             <data name="incorrectPassword" xsi:type="string">incorrect password</data>
             <data name="attempts" xsi:type="number">3</data>
diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnContactUsTest.php b/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnContactUsTest.php
@@ -75,7 +75,7 @@ public function __inject(
      * Test creation for send comment using the contact us form with captcha.
      *
      * @param Comment $comment
-     * @param null|string $configData
+     * @param string $configData
      * @return void
      */
     public function test(
@@ -92,9 +92,9 @@ public function test(
 
         $this->contactIndex->open();
         $this->assertCaptcha->processAssertRegisterForm($this->contactIndex);
-        $this->contactIndex->getFormWithCaptcha()->fill($comment);
-        $this->contactIndex->getFormWithCaptcha()->reloadCaptcha();
-        $this->contactIndex->getFormWithCaptcha()->sendComment();
+        $this->contactIndex->getContactUs()->fill($comment);
+        $this->contactIndex->getContactUs()->reloadCaptcha();
+        $this->contactIndex->getContactUs()->sendComment();
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnContactUsTest.xml b/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnContactUsTest.xml
@@ -12,7 +12,7 @@
             <data name="comment/data/captcha" xsi:type="string">111</data>
             <data name="comment/data/customer/dataset" xsi:type="string">default</data>
             <data name="configData" xsi:type="string">captcha_storefront_contact_us</data>
-            <constraint name="Magento\Contact\Test\Constraint\AssertContactUsSuccessMessage"/>
+            <constraint name="Magento\Contact\Test\Constraint\AssertContactUsSuccessMessage" />
         </variation>
     </testCase>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnStoreFrontRegisterTest.php b/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnStoreFrontRegisterTest.php
@@ -92,8 +92,8 @@ public function test(
 
         $this->customerAccountCreate->open();
         $this->assertCaptcha->processAssertRegisterForm($this->customerAccountCreate);
-        $this->customerAccountCreate->getRegisterFormWithCaptcha()->reloadCaptcha();
-        $this->customerAccountCreate->getRegisterFormWithCaptcha()->registerCustomer($customer);
+        $this->customerAccountCreate->getRegisterForm()->reloadCaptcha();
+        $this->customerAccountCreate->getRegisterForm()->registerCustomer($customer);
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnStoreFrontRegisterTest.xml b/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnStoreFrontRegisterTest.xml
@@ -11,7 +11,7 @@
             <data name="customer/dataset" xsi:type="string">register_customer</data>
             <data name="customer/data/captcha" xsi:type="string">111</data>
             <data name="configData" xsi:type="string">captcha_storefront_register</data>
-            <constraint name="Magento\Customer\Test\Constraint\AssertCustomerSuccessRegisterMessage"/>
+            <constraint name="Magento\Customer\Test\Constraint\AssertCustomerSuccessRegisterMessage" />
         </variation>
     </testCase>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryNavigationMenu.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryNavigationMenu.php
@@ -40,7 +40,7 @@ public function processAssert(
 
         foreach (array_reverse($categoriesNames) as $category) {
             \PHPUnit_Framework_Assert::assertTrue(
-                $cmsIndex->getTopMenu()->isCategoryVisible($category),
+                $cmsIndex->getTopmenu()->isCategoryVisible($category),
                 'Category ' . $category . ' is not visible in top menu.'
             );
             $cmsIndex->getTopMenu()->hoverCategoryByName($category);
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Product/CatalogProductView.xml b/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\Catalog\Test\Block\Messages" locator=".page.messages" strategy="css selector" />
+        <block name="messagesBlock" class="Magento\Backend\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>
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.php
@@ -133,10 +133,16 @@ public function __prepare(
      * @param array $cart
      * @param string|null $configData [optional]
      * @param bool $flushCache [optional]
+     * @param bool $isValidationFailed
      * @return array
      */
-    public function test(array $productsData, array $cart, $configData = null, $flushCache = false)
-    {
+    public function test(
+        array $productsData,
+        array $cart,
+        $configData = null,
+        $flushCache = false,
+        $isValidationFailed = false
+    ) {
         // Preconditions
         $this->configData = $configData;
         $this->flushCache = $flushCache;
@@ -154,6 +160,7 @@ public function test(array $productsData, array $cart, $configData = null, $flus
 
         // Steps
         $this->addToCart($products);
+        $this->waitAddToCartMessage($isValidationFailed);
 
         $cart['data']['items'] = ['products' => $products];
         return [
@@ -194,6 +201,21 @@ protected function addToCart(array $products)
         $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.
      *
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.xml
@@ -254,12 +254,14 @@
         <variation name="AddProductsToShoppingCartEntityTestVariation11" summary="Create product with all types of custom options that are required and trigger JS validation" ticketId="MAGETWO-45389">
             <data name="productsData/0" xsi:type="string">catalogProductSimple::with_all_required_custom_option</data>
             <data name="cart/data/subtotal" xsi:type="string">6160.00</data>
+            <data name="isValidationFailed" xsi:type="boolean">true</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductCustomOptionsErrors" />
             <constraint name="Magento\Checkout\Test\Constraint\AssertProductsAbsentInShoppingCart" />
         </variation>
         <variation name="AddProductsToShoppingCartEntityTestVariation12" summary="Create product with all types of custom options that are required and check that item options for product(s) display with correct information" ticketId="MAGETWO-45389">
             <data name="productsData/0" xsi:type="string">catalogProductSimple::with_all_required_custom_option</data>
             <data name="cart/data/subtotal" xsi:type="string">6160.00</data>
+            <data name="isValidationFailed" xsi:type="boolean">true</data>
             <constraint name="Magento\Checkout\Test\Constraint\AssertCartItemsOptions" />
         </variation>
     </testCase>
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/AddProductsToTheCartStep.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/AddProductsToTheCartStep.php
@@ -105,7 +105,6 @@ public function run()
             $this->browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
             $this->catalogProductView->getViewBlock()->waitForElementNotVisible($this->loadingSelector);
             $this->catalogProductView->getViewBlock()->addToCart($product);
-            $this->catalogProductView->getMessagesBlock()->waitMessage();
         }
         $cart['data']['items'] = ['products' => $this->products];
         return ['cart' => $this->fixtureFactory->createByCode('cart', $cart)];
diff --git a/dev/tests/functional/tests/app/Magento/Contact/Test/Block/Form/ContactUs.php b/dev/tests/functional/tests/app/Magento/Contact/Test/Block/Form/ContactUs.php
diff --git a/dev/tests/functional/tests/app/Magento/Contact/Test/Block/Form/ContactUs.xml b/dev/tests/functional/tests/app/Magento/Contact/Test/Block/Form/ContactUs.xml
diff --git a/dev/tests/functional/tests/app/Magento/Contact/Test/Fixture/Comment.xml b/dev/tests/functional/tests/app/Magento/Contact/Test/Fixture/Comment.xml
diff --git a/dev/tests/functional/tests/app/Magento/Contact/Test/Fixture/Comment/Customer.php b/dev/tests/functional/tests/app/Magento/Contact/Test/Fixture/Comment/Customer.php
diff --git a/dev/tests/functional/tests/app/Magento/Contact/Test/Page/ContactIndex.xml b/dev/tests/functional/tests/app/Magento/Contact/Test/Page/ContactIndex.xml
diff --git a/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/Block/Navigation.php b/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/Block/Navigation.php
diff --git a/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/Constraint/AssertCategoryLayeredNavigation.php b/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/Constraint/AssertCategoryLayeredNavigation.php

Original file line number	Diff line number	Diff line change
`@@ -23,12 +23,12 @@ class AssertCaptchaFieldOnContactUsForm extends AbstractConstraint`
`23`	`23`	`public function processAssertRegisterForm(ContactIndex $contactIndex)`
`24`	`24`	`{`
`25`	`25`	`\PHPUnit_Framework_Assert::assertTrue(`
`26`		`- $contactIndex->getFormWithCaptcha()->isVisibleCaptcha(),`
	`26`	`+ $contactIndex->getContactUs()->isVisibleCaptcha(),`
`27`	`27`	`'Captcha image is not displayed on the Contact Us page.'`
`28`	`28`	`);`
`29`	`29`
`30`	`30`	`\PHPUnit_Framework_Assert::assertTrue(`
`31`		`- $contactIndex->getFormWithCaptcha()->isVisibleCaptchaReloadButton(),`
	`31`	`+ $contactIndex->getContactUs()->isVisibleCaptchaReloadButton(),`
`32`	`32`	`'Captcha reload button is not displayed on the Contact Us page.'`
`33`	`33`	`);`
`34`	`34`	`}`