MTA-1814: Analyse functional test failures - Sprint 9

Author: orykh

dev/tests/functional/lib/Magento/Mtf/App/State/State1.php

@@ -7,45 +7,33 @@
 namespace Magento\Mtf\App\State;
 
 use Magento\Mtf\ObjectManager;
-use Magento\Mtf\Fixture\FixtureFactory;
-use Magento\Config\Test\Fixture\ConfigData;
 
 /**
  * Example Application State class.
  */
 class State1 extends AbstractState
 {
-    // TODO: Move data set to ConfigData fixture after implement merging fixture xml
     /**
-     * Data set for configuration state.
+     * Object Manager.
      *
-     * @var array
+     * @var ObjectManager
      */
-    protected $configDataSet = [
-        'section' => [
-            [
-                'path' => 'cms/wysiwyg/enabled',
-                'scope' => 'default',
-                'scope_id' => 1,
-                'value' => 'disabled',
-            ],
-        ]
-    ];
+    protected $objectManager;
 
     /**
-     * Configuration fixture.
+     * Data for configuration state.
      *
-     * @var ConfigData
+     * @var string
      */
-    protected $config;
+    protected $config ='admin_session_lifetime_1_hour, wysiwyg_disabled';
 
     /**
      * @construct
-     * @param FixtureFactory $fixtureFactory
+     * @param ObjectManager $objectManager
      */
-    public function __construct(FixtureFactory $fixtureFactory)
+    public function __construct(ObjectManager $objectManager)
     {
-        $this->config = $fixtureFactory->createByCode('configData', ['data' => $this->configDataSet]);
+        $this->objectManager = $objectManager;
     }
 
     /**
@@ -57,7 +45,10 @@ public function apply()
     {
         parent::apply();
         if (file_exists(dirname(dirname(dirname(MTF_BP))) . '/app/etc/config.php')) {
-            $this->config->persist();
+            $this->objectManager->create(
+                '\Magento\Config\Test\TestStep\SetupConfigurationStep',
+                ['configData' => $this->config]
+            )->run();
         }
     }
 

dev/tests/functional/lib/Magento/Mtf/Client/Element/SuggestElement.php

@@ -6,6 +6,7 @@
 
 namespace Magento\Mtf\Client\Element;
 
+use Magento\Framework\Webapi\Exception;
 use Magento\Mtf\Client\Locator;
 
 /**
@@ -69,8 +70,13 @@ public function setValue($value)
             $this->waitResult();
             $searchedItem = $this->find(sprintf($this->resultItem, $value), Locator::SELECTOR_XPATH);
             if ($searchedItem->isVisible()) {
-                $searchedItem->click();
-                break;
+                try {
+                    $searchedItem->click();
+                    break;
+                } catch (\Exception $e) {
+                    // In parallel run on windows change the focus is lost on element
+                    // that causes disappearing of category suggest list.
+                }
             }
         }
     }

dev/tests/functional/tests/app/Magento/AdminNotification/Test/Block/System/Messages.php

@@ -0,0 +1,36 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+
+namespace Magento\AdminNotification\Test\Block\System;
+
+use Magento\Mtf\Block\Block;
+
+/**
+ * Global messages block.
+ */
+class Messages extends Block
+{
+    /**
+     * Locator for close message block.
+     *
+     * @var string
+     */
+    protected $closePopup = '.ui-dialog-titlebar-close';
+
+    /**
+     * Close popup block.
+     *
+     * @return void
+     */
+    public function closePopup()
+    {
+        if ($this->_rootElement->isVisible()) {
+            $this->_rootElement->find($this->closePopup)->click();
+        }
+    }
+}

dev/tests/functional/tests/app/Magento/Backend/Test/Repository/ConfigData.xml

@@ -17,5 +17,9 @@
             <field path="general/store_information/street_line1" scope="general" scope_id="1" label="" xsi:type="string">10441 Jefferson Blvd</field>
             <field path="general/store_information/street_line2" scope="general" scope_id="1" label="" xsi:type="string">Suite 200</field>
         </dataset>
+
+        <dataset name="admin_session_lifetime_1_hour">
+            <field path="admin/security/session_lifetime" scope="default" scope_id="0" label="3600" xsi:type="string">3600</field>
+        </dataset>
     </repository>
 </config>

dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ListProduct.php

@@ -21,7 +21,7 @@ class ListProduct extends Block
      *
      * @var string
      */
-    protected $productItem = './/*[contains(@class,"product-item-link") and text()="%s"]/ancestor::li';
+    protected $productItem = './/*[contains(@class,"product-item-link") and normalize-space(text())="%s"]/ancestor::li';
 
     /**
      * Sorter dropdown selector.

dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInCategory.php

@@ -67,7 +67,7 @@ protected function assertPrice(FixtureInterface $product, CatalogCategoryView $c
         $price = $catalogCategoryView->getListProductBlock()->getProductItem($product)->getPriceBlock()->getPrice();
 
         \PHPUnit_Framework_Assert::assertEquals(
-            number_format($product->getPrice(), 2),
+            number_format($product->getPrice(), 2, '.', ''),
             $price,
             'Product regular price on category page is not correct.'
         );

dev/tests/functional/tests/app/Magento/CatalogRule/Test/Handler/CatalogRule/Curl.php

@@ -158,7 +158,7 @@ public function getCategoryPriceRuleId(array $data)
         $response = $curl->read();
         $curl->close();
 
-        $pattern = '/col\-rule_id[\s\W]*(\d+)\s*<.td>\s*<[^<>]*?>' . $data['name'] . '/siu';
+        $pattern = '/col\-rule_id[\s\W]*(\d+).*?' . $data['name'] . '/siu';
         preg_match($pattern, $response, $matches);
         if (empty($matches)) {
             throw new \Exception('Cannot find Catalog Price Rule id! Response: ' . $response);

dev/tests/functional/tests/app/Magento/CatalogRule/Test/Page/Adminhtml/CatalogRuleIndex.xml

@@ -6,9 +6,10 @@
  */
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/pages.xsd">
-  <page name="CatalogRuleIndex" area="Adminhtml" mca="catalog_rule/promo_catalog/index" module="Magento_CatalogRule">
-    <block name="messagesBlock" class="Magento\Backend\Test\Block\Messages" locator="#messages .messages" strategy="css selector"/>
-    <block name="gridPageActions" class="Magento\CatalogRule\Test\Block\Adminhtml\Promo\GridPageActions" locator=".page-main-actions" strategy="css selector"/>
-    <block name="catalogRuleGrid" class="Magento\CatalogRule\Test\Block\Adminhtml\Promo\Catalog" locator="#promo_catalog_grid" strategy="css selector"/>
-  </page>
+    <page name="CatalogRuleIndex" area="Adminhtml" mca="catalog_rule/promo_catalog/index" module="Magento_CatalogRule">
+        <block name="messagesBlock" class="Magento\Backend\Test\Block\Messages" locator="#messages .messages" strategy="css selector" />
+        <block name="gridPageActions" class="Magento\CatalogRule\Test\Block\Adminhtml\Promo\GridPageActions" locator=".page-main-actions" strategy="css selector" />
+        <block name="catalogRuleGrid" class="Magento\CatalogRule\Test\Block\Adminhtml\Promo\Catalog" locator="#promo_catalog_grid" strategy="css selector" />
+        <block name="systemMessageDialog" class="Magento\AdminNotification\Test\Block\System\Messages" locator='[role="dialog"].ui-popup-message' strategy="css selector" />
+    </page>
 </config>

dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestStep/DeleteAllCatalogRulesStep.php

@@ -54,6 +54,7 @@ public function run()
         while ($this->catalogRuleIndex->getCatalogRuleGrid()->isFirstRowVisible()) {
             $this->catalogRuleIndex->getCatalogRuleGrid()->openFirstRow();
             $this->catalogRuleNew->getFormPageActions()->delete();
+            $this->catalogRuleIndex->getSystemMessageDialog()->closePopup();
         }
     }
 }

dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Sidebar.php

@@ -42,7 +42,7 @@ class Sidebar extends Block
      *
      * @var string
      */
-    protected $cartItemByProductName = './/*[contains(@class,"products minilist")]//li[.//a[.="%s"]]';
+    protected $cartProductName = './/*[@id="mini-cart"]//li[.//a[normalize-space(text())="%s"]]';
 
     /**
      * Counter qty locator
@@ -110,7 +110,7 @@ public function getCartItem(FixtureInterface $product)
             $cartItem = $this->callRender($typeId, 'getCartItem', ['product' => $product]);
         } else {
             $cartItemBlock = $this->_rootElement->find(
-                sprintf($this->cartItemByProductName, $product->getName()),
+                sprintf($this->cartProductName, $product->getName()),
                 Locator::SELECTOR_XPATH
             );
             $cartItem = $this->blockFactory->create(