MTA-2350: Add wait to form element before filling a value

Dmytro Aponasenko · Dmytro Aponasenko · commit 78d318f308c6 · 2015-06-22T13:59:34.000+03:00
- fixed install test
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Shipping.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Shipping.php
@@ -11,55 +11,61 @@
 use Magento\Mtf\Client\Locator;
 
 /**
- * Class Shipping
- * Cart shipping block
+ * Cart shipping block.
  */
 class Shipping extends Form
 {
     /**
-     * Form wrapper selector
+     * Form wrapper selector.
      *
      * @var string
      */
     protected $formWrapper = '.content';
 
     /**
-     * Open shipping form selector
+     * Open shipping form selector.
      *
      * @var string
      */
     protected $openForm = '.title';
 
     /**
-     * Get quote selector
+     * Get quote selector.
      *
      * @var string
      */
     protected $getQuote = '.action.quote';
 
     /**
-     * Update total selector
+     * Update total selector.
      *
      * @var string
      */
     protected $updateTotalSelector = '.action.update';
 
     /**
-     * Selector to access the shipping carrier method
+     * Selector to access the shipping carrier method.
      *
      * @var string
      */
     protected $shippingMethod = '//span[text()="%s"]/following::*//*[contains(text(), "%s")]';
 
     /**
-     * From with shipping available shipping methods
+     * From with shipping available shipping methods.
      *
      * @var string
      */
     protected $shippingMethodForm = '#co-shipping-method-form';
 
     /**
-     * Open estimate shipping and tax form
+     * Fields that are used in estimation shipping form.
+     *
+     * @var array
+     */
+    protected $estimationFields = ['country_id', 'region_id', 'region', 'postcode'];
+
+    /**
+     * Open estimate shipping and tax form.
      *
      * @return void
      */
@@ -71,7 +77,7 @@ public function openEstimateShippingAndTax()
     }
 
     /**
-     * Click Get quote button
+     * Click Get quote button.
      *
      * @return void
      */
@@ -81,7 +87,7 @@ public function clickGetQuote()
     }
 
     /**
-     * Select shipping method
+     * Select shipping method.
      *
      * @param array $shipping
      * @return void
@@ -97,20 +103,22 @@ public function selectShippingMethod(array $shipping)
     }
 
     /**
-     * Fill shipping and tax form
+     * Fill shipping and tax form.
      *
      * @param Address $address
      * @return void
      */
     public function fillEstimateShippingAndTax(Address $address)
     {
         $this->openEstimateShippingAndTax();
-        $this->fill($address);
+        $data = $address->getData();
+        $mapping = $this->dataMapping(array_intersect_key($data, array_flip($this->estimationFields)));
+        $this->_fill($mapping, $this->_rootElement);
         $this->clickGetQuote();
     }
 
     /**
-     * Determines if the specified shipping carrier/method is visible on the cart
+     * Determines if the specified shipping carrier/method is visible on the cart.
      *
      * @param $carrier
      * @param $method
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/CreateAdmin.xml b/dev/tests/functional/tests/app/Magento/Install/Test/Block/CreateAdmin.xml
@@ -5,7 +5,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<mapping strict="0">
+<mapping strict="1">
     <fields>
         <username>
             <selector>[name='adminUsername']</selector>
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/CustomizeStore.php b/dev/tests/functional/tests/app/Magento/Install/Test/Block/CustomizeStore.php
@@ -24,11 +24,11 @@ class CustomizeStore extends Form
     protected $next = "[ng-click*='checkModuleConstraints']";
 
     /**
-     * First field selector
+     * Module configuration section.
      *
      * @var string
      */
-    protected $firstField = '[ng-model*="language"]';
+    protected $moduleConfiguration = '.customize-your-store-advanced';
 
     /**
      * Click on 'Next' button.
@@ -49,7 +49,17 @@ public function clickNext()
      */
     public function fill(FixtureInterface $fixture, SimpleElement $element = null)
     {
-        $this->waitForElementVisible($this->firstField);
-        return parent::fill($fixture, $element);
+        $this->waitForElementVisible($this->moduleConfiguration);
+        $data = $fixture->getData();
+        $storeData = [];
+        foreach ($data as $key => $value) {
+            if (strpos($key, 'store') === 0) {
+                $storeData[$key] = $value;
+            }
+        }
+        $mapping = $this->dataMapping($storeData);
+        $this->_fill($mapping, $element);
+
+        return $this;
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/CustomizeStore.xml b/dev/tests/functional/tests/app/Magento/Install/Test/Block/CustomizeStore.xml
@@ -7,13 +7,13 @@
 -->
 <mapping strict="0">
     <fields>
-        <currency>
-            <selector>[ng-model*='currency']</selector>
+        <storeCurrency>
+            <selector>#storeCurrency</selector>
             <input>select</input>
-        </currency>
-        <language>
-            <selector>[ng-model*='language']</selector>
+        </storeCurrency>
+        <storeLanguage>
+            <selector>#storeLanguage</selector>
             <input>select</input>
-        </language>
+        </storeLanguage>
     </fields>
 </mapping>
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/Database.php b/dev/tests/functional/tests/app/Magento/Install/Test/Block/Database.php
@@ -8,6 +8,8 @@
 
 use Magento\Mtf\Block\Form;
 use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Client\Element\SimpleElement;
 
 /**
  * Database form.
@@ -28,6 +30,28 @@ class Database extends Form
      */
     protected $next = "[ng-click*='testConnection']";
 
+    /**
+     * Fill database form.
+     *
+     * @param FixtureInterface $fixture
+     * @param SimpleElement|null $element
+     * @return $this
+     */
+    public function fill(FixtureInterface $fixture, SimpleElement $element = null)
+    {
+        $data = $fixture->getData();
+        $dbData = [];
+        foreach ($data as $key => $value) {
+            if (strpos($key, 'db') === 0) {
+                $dbData[$key] = $value;
+            }
+        }
+        $mapping = $this->dataMapping($dbData);
+        $this->_fill($mapping, $element);
+
+        return $this;
+    }
+
     /**
      * Get 'Test connection successful.' message.
      *
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/WebConfiguration.php b/dev/tests/functional/tests/app/Magento/Install/Test/Block/WebConfiguration.php
@@ -7,6 +7,8 @@
 namespace Magento\Install\Test\Block;
 
 use Magento\Mtf\Block\Form;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Client\Element\SimpleElement;
 
 /**
  * Web configuration block.
@@ -27,6 +29,28 @@ class WebConfiguration extends Form
      */
     protected $advancedOptions = "[ng-click*='advanced']";
 
+    /**
+     * Fill web configuration form.
+     *
+     * @param FixtureInterface $fixture
+     * @param SimpleElement|null $element
+     * @return $this
+     */
+    public function fill(FixtureInterface $fixture, SimpleElement $element = null)
+    {
+        $data = $fixture->getData();
+        $webConfiguration = [];
+        foreach ($data as $key => $value) {
+            if (strpos($key, 'db') !== 0 && strpos($key, 'store') !== 0) {
+                $webConfiguration[$key] = $value;
+            }
+        }
+        $mapping = $this->dataMapping($webConfiguration);
+        $this->_fill($mapping, $element);
+
+        return $this;
+    }
+
     /**
      * Click on 'Next' button.
      *
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/WebConfiguration.xml b/dev/tests/functional/tests/app/Magento/Install/Test/Block/WebConfiguration.xml
@@ -7,7 +7,9 @@
 -->
 <mapping strict="0">
     <fields>
-        <web />
+        <baseUrl>
+            <selector>[name="base_url"]</selector>
+        </baseUrl>
         <admin />
         <keyOwn>
             <selector>[value="user"]</selector>
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessInstall.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessInstall.php
@@ -24,7 +24,7 @@ class AssertSuccessInstall extends AbstractConstraint
     protected $adminFieldsList = [
         ['pageData' => 'username', 'fixture' => 'username'],
         ['pageData' => 'e-mail', 'fixture' => 'email'],
-        ['pageData' => 'your_store_address', 'fixture' => 'web'],
+        ['pageData' => 'your_store_address', 'fixture' => 'baseUrl'],
         ['pageData' => 'magento_admin_address', 'fixture' => 'admin']
     ];
 
@@ -57,8 +57,8 @@ public function processAssert(Install $installPage, InstallConfig $installConfig
             $allData[$key] = isset($value['value']) ? $value['value'] : $value;
         }
 
-        $allData['web'] = (isset($allData['https']) ? $allData['https'] : $allData['web']);
-        $allData['admin'] = $allData['web'] . $allData['admin'] . '/';
+        $allData['baseUrl'] = (isset($allData['https']) ? $allData['https'] : $allData['baseUrl']);
+        $allData['admin'] = $allData['baseUrl'] . $allData['admin'] . '/';
 
         foreach ($this->adminFieldsList as $field) {
             \PHPUnit_Framework_Assert::assertEquals(
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.xml b/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.xml
@@ -6,25 +6,25 @@
  */
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/fixture.xsd">
-  <fixture name="install" module="Magento_Install" type="virtual" entity_type="install" repository_class="Magento\Install\Test\Repository\Install" handler_interface="Magento\Install\Test\Handler\Install\InstallInterface" class="Magento\Install\Test\Fixture\Install">
-    <field name="dbHost"/>
-    <field name="dbUser"/>
-    <field name="dbPassword"/>
-    <field name="dbName"/>
-    <field name="web"/>
-    <field name="admin"/>
-    <field name="adminUsername"/>
-    <field name="adminEmail"/>
-    <field name="adminPassword"/>
-    <field name="adminConfirm"/>
-    <field name="apacheRewrites"/>
-    <field name="dbTablePrefix"/>
-    <field name="keyOwn"/>
-    <field name="httpsAdmin"/>
-    <field name="https"/>
-    <field name="httpsFront"/>
-    <field name="keyValue"/>
-    <field name="language"/>
-    <field name="currency"/>
-  </fixture>
+    <fixture name="install" module="Magento_Install" type="virtual" entity_type="install" repository_class="Magento\Install\Test\Repository\Install" handler_interface="Magento\Install\Test\Handler\Install\InstallInterface" class="Magento\Install\Test\Fixture\Install">
+        <field name="dbHost" />
+        <field name="dbUser" />
+        <field name="dbPassword" />
+        <field name="dbName" />
+        <field name="dbTablePrefix" />
+        <field name="baseUrl" />
+        <field name="admin" />
+        <field name="adminUsername" />
+        <field name="adminEmail" />
+        <field name="adminPassword" />
+        <field name="adminConfirm" />
+        <field name="apacheRewrites" />
+        <field name="keyOwn" />
+        <field name="httpsAdmin" />
+        <field name="https" />
+        <field name="httpsFront" />
+        <field name="keyValue" />
+        <field name="storeLanguage" />
+        <field name="storeCurrency" />
+    </fixture>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest.php b/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest.php
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest.xml b/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest.xml
