Merge remote-tracking branch 'qm/MTA-2726' into bugs

Author: Oleksii Korshenko

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

@@ -0,0 +1,90 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Mtf\Client\Element;
+
+use Magento\Mtf\Client\Locator;
+
+/**
+ * Typified element class for select with checkboxes.
+ */
+class DropdownmultiselectElement extends MultiselectElement
+{
+    /**
+     * Selector for expanding dropdown.
+     *
+     * @var string
+     */
+    protected $toggle = 'div';
+
+    /**
+     * Selected option selector.
+     *
+     * @var string
+     */
+    protected $selectedValue = 'li._selected';
+
+    /**
+     * Option locator by value.
+     *
+     * @var string
+     */
+    protected $optionByValue = './/li[label[contains(normalize-space(.), %s)]]';
+
+    /**
+     * Set values.
+     *
+     * @param array|string $values
+     * @return void
+     */
+    public function setValue($values)
+    {
+        $this->eventManager->dispatchEvent(['set_value'], [__METHOD__, $this->getAbsoluteSelector()]);
+        $this->find($this->toggle)->click();
+        $this->deselectAll();
+        $values = is_array($values) ? $values : [$values];
+        foreach ($values as $value) {
+            $this->find(
+                sprintf($this->optionByValue, $this->escapeQuotes($value)),
+                Locator::SELECTOR_XPATH
+            )->click();
+        }
+        $this->find($this->toggle)->click();
+    }
+
+    /**
+     * Get values.
+     *
+     * @return array
+     */
+    public function getValue()
+    {
+        $this->eventManager->dispatchEvent(['get_value'], [__METHOD__, $this->getAbsoluteSelector()]);
+        $values = [];
+        $this->find($this->toggle)->click();
+        $options = $this->getElements($this->selectedValue);
+        foreach ($options as $option) {
+            $values[] = $option->getText();
+        }
+        $this->find($this->toggle)->click();
+
+        return $values;
+    }
+
+    /**
+     * Deselect all options in the element.
+     *
+     * @return void
+     */
+    public function deselectAll()
+    {
+        $options = $this->getElements($this->selectedValue);
+        /** @var SimpleElement $option */
+        foreach ($options as $option) {
+            $option->click();
+        }
+    }
+}

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

@@ -18,7 +18,7 @@ class SimplifiedselectElement extends SelectElement
      *
      * @var string
      */
-    protected $optionGroupValue = ".//*[@data-title='%s']";
+    protected $optionGroupValue = ".//*[@data-title='%s' or contains(normalize-space(.), %s)]";
 
     /**
      * Select value in ropdown which has option groups.
@@ -29,7 +29,7 @@ class SimplifiedselectElement extends SelectElement
     public function setValue($value)
     {
         $this->eventManager->dispatchEvent(['set_value'], [__METHOD__, $this->getAbsoluteSelector()]);
-        $xpath = sprintf($this->optionGroupValue, $value);
+        $xpath = sprintf($this->optionGroupValue, $value, $this->escapeQuotes($value));
         $option = $this->find($xpath, Locator::SELECTOR_XPATH);
         $option->click();
     }

dev/tests/functional/tests/app/Magento/Backend/Test/Block/Menu.php

@@ -92,6 +92,11 @@ public function navigate($menuItem)
         $this->waitForElementVisible($subMenuSelector, Locator::SELECTOR_XPATH);
         $subMenuItem = $subMenuSelector . sprintf($this->subMenuItem, $subMenu);
         $this->waitForElementVisible($subMenuItem, Locator::SELECTOR_XPATH);
+        // Resolve an issue on with "Offset within element cannot be scrolled into view" on low screen resolution
+        try {
+            $this->_rootElement->find($subMenuItem, Locator::SELECTOR_XPATH)->hover();
+        } catch (\PHPUnit_Extensions_Selenium2TestCase_WebDriverException  $e) {
+        }
         $this->_rootElement->find($subMenuItem, Locator::SELECTOR_XPATH)->click();
         $this->waitForElementNotVisible($subMenuSelector, Locator::SELECTOR_XPATH);
     }

dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php

@@ -20,7 +20,7 @@ class Search extends SuggestElement
      *
      * @var string
      */
-    protected $topPage = './ancestor::body//header[contains(@class, "page-header")]/div[1]';
+    protected $topPage = './ancestor::body//header';
 
     /**
      * Attributes locator.
@@ -80,7 +80,7 @@ public function getValue()
      */
     public function isExistAttributeInSearchResult($productAttribute)
     {
-        $this->find($this->topPage, Locator::SELECTOR_XPATH)->click();
+        $this->find($this->topPage, Locator::SELECTOR_XPATH)->hover();
         $this->find($this->actionToggle)->click();
 
         return $this->isExistValueInSearchResult($productAttribute->getFrontendLabel());

dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.xml

@@ -28,8 +28,8 @@
                 <input>select</input>
             </tax_class_id>
             <product_has_weight>
-                <selector>[name="product[product_has_weight]"]</selector>
-                <input>checkbox</input>
+                <selector>[data-role="weight-switcher"]</selector>
+                <input>radiobutton</input>
             </product_has_weight>
             <category_ids>
                 <selector>#attribute-category_ids-container</selector>

dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCompareProductsTest.xml

@@ -28,7 +28,7 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductCompareBlockOnCmsPage" />
         </variation>
         <variation name="AddCompareProductsTestVariation4">
-            <data name="products" xsi:type="string">catalogProductSimple::simple_for_composite_products,catalogProductVirtual::default,downloadableProduct::default,groupedProduct::grouped_product_with_price,configurableProduct::default,bundleProduct::bundle_dynamic_product,bundleProduct::bundle_fixed_product</data>
+            <data name="products" xsi:type="string">catalogProductSimple::simple_for_composite_products,catalogProductVirtual::default,downloadableProduct::default,groupedProduct::grouped_product_with_price,configurableProduct::configurable_with_qty_1,bundleProduct::bundle_dynamic_product,bundleProduct::bundle_fixed_product</data>
             <data name="isCustomerLoggedIn" xsi:type="string">Yes</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductCompareItemsLink" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductComparePage" />

dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest.php

@@ -81,10 +81,10 @@ public function __inject(
     public function test($createProduct, $product)
     {
         // Steps
-        $this->catalogProductIndex->open();
-        $this->catalogProductIndex->getGridPageActionBlock()->addProduct($createProduct);
         list($fixture, $dataset) = explode('::', $product);
         $product = $this->fixtureFactory->createByCode($fixture, ['dataset' => $dataset]);
+        $this->catalogProductIndex->open();
+        $this->catalogProductIndex->getGridPageActionBlock()->addProduct($createProduct);
         $this->catalogProductNew->getProductForm()->fill($product);
         $this->catalogProductNew->getFormPageActions()->save($product);
 

dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityFromProductPageTest.xml

@@ -43,7 +43,6 @@
             <data name="attribute/data/is_filterable_in_search" xsi:type="string">Yes</data>
             <data name="assertProduct/data/name" xsi:type="string">Product name</data>
             <data name="assertProduct/data/sku" xsi:type="string">product-sku</data>
-            <data name="assertProduct/data/price" xsi:type="string">25</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductAttributeIsFilterable" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductAttributeIsFilterableInSearch" />
             <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertProductAttributeIsConfigurable" />

dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest.xml

@@ -128,7 +128,6 @@
             <data name="productAttribute/data/used_for_sort_by" xsi:type="string">Yes</data>
             <data name="assertProduct/data/name" xsi:type="string">Product name</data>
             <data name="assertProduct/data/sku" xsi:type="string">product-sku</data>
-            <data name="assertProduct/data/price" xsi:type="string">25</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductAttributeInGrid" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertAttributeForm" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertAddedProductAttributeOnProductForm" />

dev/tests/functional/tests/app/Magento/Cms/Test/Block/Adminhtml/Block/CmsGrid.php

@@ -44,8 +44,9 @@ class CmsGrid extends DataGrid
             'input' => 'simplifiedselect'
         ],
         'is_active' => [
-            'selector' => '[name="is_active"]',
-            'input' => 'select',
+            'selector' => '//label[span[text()="Status"]]/following-sibling::div',
+            'strategy' => 'xpath',
+            'input' => 'dropdownmultiselect',
         ],
         'creation_time_from' => [
             'selector' => '[name="creation_time[from]"]',