MTA-2144: Maintain functional tests

Author: orykh

dev/tests/functional/composer.json

@@ -1,6 +1,6 @@
 {
     "require": {
-        "magento/mtf": "1.0.0-rc24",
+        "magento/mtf": "1.0.0-rc25",
         "php": "~5.5.0|~5.6.0",
         "phpunit/phpunit": "4.1.0",
         "phpunit/phpunit-selenium": ">=1.2",

dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/Customer/Address.php

@@ -49,18 +49,18 @@ public function __construct(FixtureFactory $fixtureFactory, array $params, array
         $this->params = $params;
 
         if (isset($data['presets'])) {
-            $data['presets'] = explode(',', $data['presets']);
+            $data['presets'] = array_map('trim', explode(',', $data['presets']));
             foreach ($data['presets'] as $value) {
-                /** @var AddressFixture $addresses*/
-                $addresses = $fixtureFactory->createByCode('address', ['dataSet' => $value]);
-                $this->data[] = $addresses->getData();
-                $this->addressesFixture[] = $addresses;
+                /** @var AddressFixture $address*/
+                $address = $fixtureFactory->createByCode('address', ['dataSet' => $value]);
+                $this->data[] = $address->getData();
+                $this->addressesFixture[] = $address;
             }
         } elseif (empty($data['presets']) && !empty($data['addresses'])) {
-            foreach ($data['addresses'] as $addresses) {
-                /** @var AddressFixture $addresses */
-                $this->data[] = $addresses->getData();
-                $this->addressesFixture[] = $addresses;
+            foreach ($data['addresses'] as $address) {
+                /** @var AddressFixture $address */
+                $this->data[] = $address->getData();
+                $this->addressesFixture[] = $address;
             }
         }
     }

dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/RegisterCustomerFrontendEntityTest.php

@@ -60,6 +60,7 @@ public function __inject(
         $this->customerAccountLogout = $customerAccountLogout;
         $this->customerAccountCreate = $customerAccountCreate;
         $this->cmsIndex = $cmsIndex;
+        $this->customerAccountLogout->open();
     }
 
     /**

dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationResourcesPopup.php

@@ -61,8 +61,8 @@ protected function verifyResources(array $formResources, array $fixtureResources
         if (!empty($diff)) {
             $errorMessage = sprintf(
                 "Resources are not equal.\nExpected: %s\nActual: %s",
-                implode(",\n", $fixtureResources),
-                implode(",\n", $formResources)
+                implode(",\n", $formResources),
+                implode(",\n", $topFormResources)
             );
         }
 

dev/tests/functional/tests/app/Magento/Integration/Test/Repository/Integration.xml

@@ -16,13 +16,14 @@
                 <item name="1" xsi:type="string">Sales</item>
                 <item name="2" xsi:type="string">Products</item>
                 <item name="3" xsi:type="string">Customers</item>
-                <item name="4" xsi:type="string">My Account</item>
-                <item name="5" xsi:type="string">Marketing</item>
-                <item name="6" xsi:type="string">Content</item>
-                <item name="7" xsi:type="string">Reports</item>
-                <item name="8" xsi:type="string">Stores</item>
-                <item name="9" xsi:type="string">System</item>
-                <item name="10" xsi:type="string">Global Search</item>
+                <item name="4" xsi:type="string">Carts</item>
+                <item name="5" xsi:type="string">My Account</item>
+                <item name="6" xsi:type="string">Marketing</item>
+                <item name="7" xsi:type="string">Content</item>
+                <item name="8" xsi:type="string">Reports</item>
+                <item name="9" xsi:type="string">Stores</item>
+                <item name="10" xsi:type="string">System</item>
+                <item name="11" xsi:type="string">Global Search</item>
             </field>
         </dataset>
     </repository>

dev/tests/functional/tests/app/Magento/Multishipping/Test/Block/Checkout/Addresses.php

@@ -48,7 +48,7 @@ public function selectAddresses($bindings)
     {
         foreach ($bindings as $key => $value) {
             $this->_rootElement->find(
-                '//tr[//a[text()="' . $key . '"]]/following-sibling::*//select',
+                '//tr[.//a[text()="' . $key . '"]]//select[contains(@name,"[address]")]',
                 Locator::SELECTOR_XPATH,
                 'select'
             )->setValue($value);

dev/tests/functional/tests/app/Magento/Multishipping/Test/TestStep/FillCustomerAddressesStep.php

@@ -74,9 +74,10 @@ public function run()
         $bindings = [];
         foreach ($this->products as $key => $product) {
             $productName = $product->getName();
+            $addresses = $this->customer->getDataFieldConfig('address')['source']->getAddresses();
             $addressRender = $this->objectManeger->create(
                 '\Magento\Customer\Test\Block\Address\Renderer',
-                ['address' => $this->customer->getAddress()[$key], 'type' => 'oneline']
+                ['address' => $addresses[$key], 'type' => 'oneline']
             );
             $bindings[$productName] = $addressRender->render();
         }

dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundInCreditMemoTab.php

@@ -46,7 +46,7 @@ public function processAssert(
             ];
             $grid->search($filter);
             $filter['amount_from'] = number_format($amount[$key]['grand_creditmemo_total'], 2);
-            $filter['amount_to'] = number_format($amount[$key]['grand_creditmemo_total'], 2);
+            unset($filter['amount_to']);
             \PHPUnit_Framework_Assert::assertTrue(
                 $grid->isRowVisible($filter, false, false),
                 'Credit memo is absent on credit memos tab.'

dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/SalesCreditMemoView.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="SalesCreditMemoView" area="Adminhtml" mca="sales/creditmemo/view" module="Magento_Sales">
-    <block name="itemsBlock" class="Magento\Sales\Test\Block\Adminhtml\Order\Creditmemo\View\Items" locator=".grid" strategy="css selector"/>
-  </page>
+    <page name="SalesCreditMemoView" area="Adminhtml" mca="sales/creditmemo/view" module="Magento_Sales">
+        <block name="itemsBlock" class="Magento\Sales\Test\Block\Adminhtml\Order\Creditmemo\View\Items" locator="#creditmemo_items_container" strategy="css selector" />
+    </page>
 </config>

dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/basic.xml

@@ -15,7 +15,7 @@
     <rule scope="testcase">
         <deny>
             <tag group="test_type" value="3rd_party_test" />
-	    <tag group="test_type" value="3rd_party_test_deprecated" />
+            <tag group="test_type" value="3rd_party_test_deprecated" />
         </deny>
     </rule>
 </config>