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

- Defects fixed

Author: AndreiZiblitski

dev/tests/functional/tests/app/Magento/Captcha/Test/Fixture/Comment.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="comment">
+        <field name="captcha" is_required="0" />
+    </fixture>
+</config>

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

@@ -8,7 +8,9 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Captcha\Test\TestCase\CaptchaOnContactUsTest" summary="Check CAPTCHA on Contact Us Page" ticketId="MAGETWO-43609">
         <variation name="CaptchaOnContactUsTestVariation1">
-            <data name="comment/dataset" xsi:type="string">comment_with_captcha</data>
+            <data name="comment/data/comment" xsi:type="string">some comment</data>
+            <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"/>
         </variation>

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

@@ -11,7 +11,6 @@
              repository_class="Magento\Contact\Test\Repository\Comment"
              class="Magento\Contact\Test\Fixture\Comment">
         <field name="comment" is_required="0" />
-        <field name="captcha" is_required="0" />
         <field name="customer" is_required="0" source="Magento\Contact\Test\Fixture\Comment\Customer"/>
     </fixture>
 </config>

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

@@ -49,6 +49,7 @@ public function __construct(
         $this->fixtureFactory = $fixtureFactory;
         $this->params = $params;
         $this->fixtureData = $data;
+        $this->data = $data;
     }
 
     /**
@@ -71,8 +72,8 @@ public function getData($key = null)
                 $customer->persist();
             }
             $this->customer = $customer;
+            $this->data = $customer->getData();
         }
-        $this->data = $customer->getData();
 
         return parent::getData($key);
     }