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

- Defects fixed

Author: AndreiZiblitski

dev/tests/functional/tests/app/Magento/Captcha/Test/Block/Form/ContactUsFormWithCaptcha.php

@@ -8,8 +8,6 @@
 
 use Magento\Mtf\Block\Form;
 use Magento\Mtf\Client\Locator;
-use Magento\Mtf\Client\ElementInterface;
-use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Form for "Contact Us" page with captcha.
@@ -68,14 +66,12 @@ public function reloadCaptcha()
     }
 
     /**
-     * Send comment.
+     * Click submit button.
      *
-     * @param FixtureInterface $fixture
      * @return void
      */
-    public function sendComment(FixtureInterface $fixture)
+    public function sendComment()
     {
-        $this->fill($fixture);
         $this->_rootElement->find($this->submit, Locator::SELECTOR_CSS)->click();
     }
 }

dev/tests/functional/tests/app/Magento/Captcha/Test/Constraint/AssertCaptchaFieldOnContactUsForm.php

@@ -6,7 +6,7 @@
 
 namespace Magento\Captcha\Test\Constraint;
 
-use Magento\Captcha\Test\Page\ContactUs;
+use Magento\Contact\Test\Page\ContactIndex;
 use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
@@ -17,18 +17,18 @@ class AssertCaptchaFieldOnContactUsForm extends AbstractConstraint
     /**
      * Assert captcha on the Contact Us page.
      *
-     * @param ContactUs $contactUsPage
+     * @param ContactIndex $contactIndex
      * @return void
      */
-    public function processAssertRegisterForm(ContactUs $contactUsPage)
+    public function processAssertRegisterForm(ContactIndex $contactIndex)
     {
         \PHPUnit_Framework_Assert::assertTrue(
-            $contactUsPage->getFormWithCaptcha()->isVisibleCaptcha(),
+            $contactIndex->getFormWithCaptcha()->isVisibleCaptcha(),
             'Captcha image is not displayed on the Contact Us page.'
         );
 
         \PHPUnit_Framework_Assert::assertTrue(
-            $contactUsPage->getFormWithCaptcha()->isVisibleCaptchaReloadButton(),
+            $contactIndex->getFormWithCaptcha()->isVisibleCaptchaReloadButton(),
             'Captcha reload button is not displayed on the Contact Us page.'
         );
     }

dev/tests/functional/tests/app/Magento/Captcha/Test/Fixture/Customer.xml

@@ -8,6 +8,5 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/fixture.xsd">
     <fixture name="customer">
         <field name="captcha" is_required="0" />
-        <field name="comment" is_required="0" />
     </fixture>
 </config>

dev/tests/functional/tests/app/Magento/Captcha/Test/Page/ContactUs.xml renamed to dev/tests/functional/tests/app/Magento/Captcha/Test/Page/ContactIndex.xml

@@ -6,7 +6,7 @@
  */
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/pages.xsd">
-    <page name="ContactUs" mca="contact/index/index" module="Magento_Captcha">
+    <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"/>
     </page>
 </config>

dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnContactUsTest.php

@@ -10,11 +10,11 @@
 use Magento\Mtf\TestStep\TestStepFactory;
 use Magento\Captcha\Test\Constraint\AssertCaptchaFieldOnContactUsForm;
 use Magento\Customer\Test\Fixture\Customer;
-use Magento\Captcha\Test\Page\ContactUs;
+use Magento\Contact\Test\Page\ContactIndex;
 
 /**
  * Preconditions:
- * 1. Enable CAPTCHA for customer.
+ * 1. Enable captcha for customer.
  *
  * Test Flow:
  * 1. Open contact us page.
@@ -33,18 +33,18 @@ class CaptchaOnContactUsTest extends Injectable
     private $stepFactory;
 
     /**
-     * Assert Captcha.
+     * Assert captcha on "Contact Us" page.
      *
      * @var AssertCaptchaFieldOnContactUsForm
      */
     private $assertCaptcha;
 
     /**
-     * ContactUs page.
+     * ContactIndex page.
      *
-     * @var ContactUs
+     * @var ContactIndex
      */
-    private $contactUs;
+    private $contactIndex;
 
     /**
      * Configuration setting.
@@ -58,17 +58,17 @@ class CaptchaOnContactUsTest extends Injectable
      *
      * @param TestStepFactory $stepFactory
      * @param AssertCaptchaFieldOnContactUsForm $assertCaptcha
-     * @param ContactUs $contactUs
+     * @param ContactIndex $contactIndex
      * @return void
      */
     public function __inject(
         TestStepFactory $stepFactory,
         AssertCaptchaFieldOnContactUsForm $assertCaptcha,
-        ContactUs $contactUs
+        ContactIndex $contactIndex
     ) {
         $this->stepFactory = $stepFactory;
         $this->assertCaptcha = $assertCaptcha;
-        $this->contactUs = $contactUs;
+        $this->contactIndex = $contactIndex;
     }
 
     /**
@@ -90,10 +90,11 @@ public function test(
             ['configData' => $this->configData]
         )->run();
 
-        $this->contactUs->open();
-        $this->assertCaptcha->processAssertRegisterForm($this->contactUs);
-        $this->contactUs->getFormWithCaptcha()->reloadCaptcha();
-        $this->contactUs->getFormWithCaptcha()->sendComment($customer);
+        $this->contactIndex->open();
+        $this->assertCaptcha->processAssertRegisterForm($this->contactIndex);
+        $this->contactIndex->getFormWithCaptcha()->fill($customer);
+        $this->contactIndex->getFormWithCaptcha()->reloadCaptcha();
+        $this->contactIndex->getFormWithCaptcha()->sendComment();
     }
 
     /**

dev/tests/functional/tests/app/Magento/Contact/Test/Block/Form/Messages.php

@@ -6,12 +6,12 @@
 
 namespace Magento\Contact\Test\Block\Form;
 
-use Magento\Mtf\Block\Form;
+use Magento\Mtf\Block\Block;
 
 /**
  * Message block on "Contact Us" page.
  */
-class Messages extends Form
+class Messages extends Block
 {
     /**
      * Message selector.

dev/tests/functional/tests/app/Magento/Contact/Test/Constraint/AssertContactUsSuccessMessage.php

@@ -7,27 +7,34 @@
 namespace Magento\Contact\Test\Constraint;
 
 use Magento\Mtf\Constraint\AbstractConstraint;
-use Magento\Captcha\Test\Page\ContactUs;
+use Magento\Contact\Test\Page\ContactIndex;
 
 /**
  * Assert that success message is present on "Contact Us" page.
  */
 class AssertContactUsSuccessMessage extends AbstractConstraint
 {
-    const SUCCESS_MESSAGE =
-        "Thanks for contacting us with your comments and questions. We'll respond to you very soon.";
+    /**
+     * Success sent comment message(the first part).
+     */
+    const SUCCESS_MESSAGE_PART_1 = "Thanks for contacting us with your comments and questions. ";
+
+    /**
+     * Success sent comment message(the second part).
+     */
+    const SUCCESS_MESSAGE_PART_2 = "We'll respond to you very soon.";
 
     /**
      * Assert that success message is present on "Contact Us" page.
      *
-     * @param ContactUs $contactUsPage
+     * @param ContactIndex $contactIndex
      * @return void
      */
-    public function processAssert(ContactUs $contactUsPage)
+    public function processAssert(ContactIndex $contactIndex)
     {
         \PHPUnit_Framework_Assert::assertEquals(
-            self::SUCCESS_MESSAGE,
-            $contactUsPage->getMessagesBlock()->getMessage(),
+            self::SUCCESS_MESSAGE_PART_1 . self::SUCCESS_MESSAGE_PART_2,
+            $contactIndex->getMessagesBlock()->getMessage(),
             'Wrong message is displayed.'
         );
     }

dev/tests/functional/tests/app/Magento/Contact/Test/Fixture/Customer.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/fixture.xsd">
+    <fixture name="customer">
+        <field name="comment" is_required="0" />
+    </fixture>
+</config>

dev/tests/functional/tests/app/Magento/Contact/Test/Page/ContactUs.xml renamed to dev/tests/functional/tests/app/Magento/Contact/Test/Page/ContactIndex.xml

@@ -6,7 +6,7 @@
  */
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/pages.xsd">
-    <page name="ContactUs" mca="contact/index/index" module="Magento_Contact">
+    <page name="ContactIndex" mca="contact/index/index" module="Magento_Contact">
         <block name="messagesBlock" class="Magento\Contact\Test\Block\Form\Messages" locator=".messages" strategy="css selector"/>
     </page>
 </config>