Merge pull request #381 from magento-qmt/develop

[Mavericks] Functional tests maintenance

Author: lanken

dev/tests/functional/composer.json

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

dev/tests/functional/lib/Magento/Mtf/Util/ModuleResolver/SequenceSorter.php

@@ -63,7 +63,8 @@ public function sort(array $paths)
         $modules = array_keys($this->getModuleSequence());
         foreach ($modules as $module) {
             foreach ($paths as $key => $path) {
-                $modulePath = realpath(MTF_TESTS_PATH . str_replace('_', '/', $module));
+                $modulePath = realpath(MTF_TESTS_PATH . str_replace('_', DIRECTORY_SEPARATOR, $module));
+                $path = realpath($path);
                 if (strpos($path, $modulePath) !== false) {
                     $sortedPaths[] = $path;
                     unset($paths[$key]);

dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/FormTabs.php

@@ -91,10 +91,24 @@ public function openTab($tabName)
                 'Tab "' . $tabName . '" is not visible.'
             );
         }
-        $this->getContainerElement($tabName)->click();
+        $this->browser->find($this->header)->hover();
+        $this->clickOnTabName($tabName);
+        $this->browser->find($this->header)->hover();
+
         return $this;
     }
 
+    /**
+     * Click on tab name.
+     *
+     * @param string $tabName
+     * @return void
+     */
+    protected function clickOnTabName($tabName)
+    {
+        $this->getContainerElement($tabName)->click();
+    }
+
     /**
      * Check whether tab is visible.
      *

dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/AttributeForm.php

@@ -8,9 +8,6 @@
 
 use Magento\Backend\Test\Block\Widget\FormTabs;
 use Magento\Backend\Test\Block\Widget\Tab;
-use Magento\Mtf\Block\BlockFactory;
-use Magento\Mtf\Block\Mapper;
-use Magento\Mtf\Client\BrowserInterface;
 use Magento\Mtf\Client\Element;
 use Magento\Mtf\Client\Element\SimpleElement;
 use Magento\Mtf\Client\Locator;
@@ -43,21 +40,13 @@ class AttributeForm extends FormTabs
     protected $isTabOpened = '.opened ';
 
     /**
-     * @constructor
-     * @param SimpleElement $element
-     * @param BlockFactory $blockFactory
-     * @param Mapper $mapper
-     * @param BrowserInterface $browser
-     * @param array $config
+     * Initialize block. Switch to frame.
+     *
+     * @return void
      */
-    public function __construct(
-        SimpleElement $element,
-        BlockFactory $blockFactory,
-        Mapper $mapper,
-        BrowserInterface $browser,
-        array $config = []
-    ) {
-        parent::__construct($element, $blockFactory, $mapper, $browser, $config);
+    protected function init()
+    {
+        parent::init();
         $this->browser->switchToFrame(new Locator($this->iFrame));
     }
 
@@ -82,7 +71,7 @@ function () use ($browser, $selector) {
     }
 
     /**
-     * Open tab
+     * Open tab.
      *
      * @param string $tabName
      * @return Tab

dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Adminhtml/FormPageActions.php

@@ -19,7 +19,7 @@ class FormPageActions extends PageActions
      *
      * @var string
      */
-    protected $saveAndApplyButton = '#save_apply';
+    protected $saveAndApplyButton = '#save_and_apply';
 
     /**
      * Click on "Save and Apply" button

dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Adminhtml/Promo/Catalog/Edit/PromoForm.xml

@@ -30,7 +30,7 @@
         <strategy>xpath</strategy>
         <fields>
             <conditions>
-                <selector>#catalog_rule_formrule_conditions_fieldset_</selector>
+                <selector>[id^="catalog_rule_formrule_conditions_fieldset_"]</selector>
                 <input>conditions</input>
             </conditions>
         </fields>

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

@@ -10,35 +10,46 @@
 use Magento\Mtf\Client\Locator;
 
 /**
- * Class CartEmpty
- * Block for text of empty cart
+ * Block for text of empty cart.
  */
 class CartEmpty extends Block
 {
     /**
-     * Selector for link "here" to main page
+     * Selector for link "here" to main page.
      *
      * @var string
      */
-    protected $linkToMainPage = './/a';
+    private $linkToMainPage = 'p a';
 
     /**
-     * Get test for empty cart
+     * CSS selector for message text.
+     *
+     * @var string
+     */
+    private $messageText = 'p';
+
+    /**
+     * Get test for empty cart.
      *
      * @return string
      */
     public function getText()
     {
-        return str_replace("\n", ' ', $this->_rootElement->getText());
+        $result = [];
+        foreach ($this->_rootElement->getElements($this->messageText) as $item) {
+            $result[] = str_replace("\n", ' ', $item->getText());
+        }
+
+        return implode(' ', $result);
     }
 
     /**
-     * Click link to main page
+     * Click link to main page.
      *
      * @return void
      */
     public function clickLinkToMainPage()
     {
-        $this->_rootElement->find($this->linkToMainPage, Locator::SELECTOR_XPATH)->click();
+        $this->_rootElement->find($this->linkToMainPage)->click();
     }
 }

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

@@ -20,7 +20,7 @@ class Sidebar extends Block
      *
      * @var string
      */
-    protected $qty = '//*[@class="product"]/*[@title="%s"]/following-sibling::*//*[contains(@class,"item-qty")]';
+    private $qty = '//*[@class="product"]/*[@title="%s"]/following-sibling::*//*[contains(@class,"item-qty")]';
 
     /**
      * Mini cart link selector.

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

@@ -35,6 +35,20 @@ class Item extends Sidebar
      */
     protected $confirmModal = '.confirm._show[data-role=modal]';
 
+    /**
+     * CSS selector for qty field.
+     *
+     * @var string
+     */
+    private $qty = 'input.cart-item-qty';
+
+    /**
+     * CSS selector for update button.
+     *
+     * @var string
+     */
+    private $updateButton = 'button.update-cart-item';
+
     /**
      * Remove product item from mini cart
      *
@@ -59,4 +73,18 @@ public function clickEditItem()
     {
         $this->_rootElement->find($this->editItem)->click();
     }
+
+    /**
+     * Edit qty.
+     *
+     * @param array $checkoutData
+     * @return void
+     */
+    public function editQty(array $checkoutData)
+    {
+        if (isset($checkoutData['qty'])) {
+            $this->_rootElement->find($this->qty)->setValue($checkoutData['qty']);
+            $this->_rootElement->find($this->updateButton)->click();
+        }
+    }
 }

dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsPageRewriteEntityTest.php

@@ -25,14 +25,14 @@
  * 7. Save Rewrite.
  * 8. Perform all assertions.
  *
- * @group URL_Rewrites_(PS)
+ * @group URL_Rewrites_(MX)
  * @ZephyrId MAGETWO-24847
  */
 class CreateCmsPageRewriteEntityTest extends Injectable
 {
     /* tags */
     const MVP = 'yes';
-    const DOMAIN = 'PS';
+    const DOMAIN = 'MX';
     const TEST_TYPE = 'extended_acceptance_test';
     /* end tags */