Merge remote-tracking branch 'mainline/develop' into MAGETWO-37969

Author: vpaladiychuk

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

@@ -7,154 +7,138 @@
 namespace Magento\Mtf\Client\Element;
 
 use Magento\Mtf\Client\ElementInterface;
+use Magento\Mtf\Client\Locator;
 
 /**
- * Class JquerytreeElement
- * Typified element class for JqueryTree elements
+ * Typified element class for JqueryTree elements.
  */
 class JquerytreeElement extends Tree
 {
     /**
-     * Css class for finding tree nodes.
+     * Root element.
      *
      * @var string
      */
-    protected $nodeCssClass = ' > ul';
+    protected $rootElement = '//div[contains(@class, "tree x-tree jstree")]';
 
     /**
-     * Css class for detecting tree nodes.
+     * Pattern for level node.
      *
      * @var string
      */
-    protected $nodeSelector = 'li[data-id]';
+    protected $level = '/ul/li[contains(@class, "jstree")]';
 
     /**
-     * Css class for detecting tree nodes.
+     * Pattern for child element node.
      *
      * @var string
      */
-    protected $checkedNodeSelector = 'li.jstree-checked[data-id]';
+    protected $pattern = '/ul/li[contains(@class, "jstree") and a[text() = "%s"]]';
 
     /**
-     * Css class for fetching node's name.
+     * Pattern for child open node.
      *
      * @var string
      */
-    protected $nodeName = 'a';
+    protected $openNode = '//li[contains(@class, "jstree-open") and a[text() = "%s"]]';
 
     /**
-     * Array, which holds all selected elements paths.
+     * Pattern for child closed node.
      *
-     * @var array
+     * @var string
      */
-    protected $checkedNodesPaths = [];
+    protected $closedNode = '//li[contains(@class, "jstree-closed") and a[text() = "%s"]]';
 
     /**
-     * Returns structure of the jquerytree element.
+     * Selector for parent element.
      *
-     * @return array
+     * @var string
      */
-    public function getStructure()
-    {
-        return $this->_getNodeContent($this, 'div[class*=jstree] > ul');
-    }
+    protected $parentElement = './../../../a';
 
     /**
-     *  Recursive walks tree
+     * Selector for input.
      *
-     * @param ElementInterface $node
-     * @param string $parentCssClass
-     * @return array
+     * @var string
      */
-    protected function _getNodeContent(ElementInterface $node, $parentCssClass)
-    {
-        $counter = 1;
-        $nextNodeSelector = $parentCssClass . " > " . $this->nodeSelector . ":nth-of-type($counter)";
-        $nodeArray = [];
-        //Get list of all children nodes to work with
-        $newNode = $node->find($nextNodeSelector);
-        while ($newNode->isVisible()) {
-            $nextCheckedNodeSelector = $parentCssClass . " > " . $this->checkedNodeSelector . ":nth-of-type($counter)";
-            $nodesNames = $newNode->find($this->nodeName);
-            $text = ltrim($nodesNames->getText());
-            $childNodeSelector = $nextNodeSelector . $this->nodeCssClass;
-            $nodesContents = $newNode->find($childNodeSelector);
-            $subNodes = null;
-            if ($nodesContents->isVisible()) {
-                $subNodes = $this->_getNodeContent($nodesContents, $childNodeSelector);
-            }
-            $nodeArray[] = [
-                'name' => $text,
-                'isChecked' => $node->find($nextCheckedNodeSelector)->isVisible() ? true : false,
-                'element' => $newNode,
-                'subnodes' => $subNodes,
-            ];
-            ++$counter;
-            $nextNodeSelector = $parentCssClass . " > " . $this->nodeSelector . ":nth-of-type($counter)";
-            $newNode = $node->find($nextNodeSelector);
-        }
-        return $nodeArray;
-    }
+    protected $input = '/a/ins[@class="jstree-checkbox"]';
+
+    /**
+     * Selected checkboxes.
+     *
+     * @var string
+     */
+    protected $selectedLabels = '//li[contains(@class, "jstree-checked")]/a';
+
+    /**
+     * Selected checkboxes by level.
+     *
+     * @var string
+     */
+    protected $selectedLabelsByLevel = '/ul/li[contains(@class, "jstree-checked")]/a';
 
     /**
-     * Retrieve array of checked nodes from structure array.
+     * Display children.
      *
-     * @param array $structure
-     * @return array|null
+     * @param string $element
+     * @return void
      */
-    protected function getCheckedNodes($structure)
+    protected function displayChildren($element)
     {
-        $pathArray = [];
-        if ($structure['isChecked'] == true) {
-            array_push($pathArray, $structure['name']);
-            if (is_array($structure['subnodes'])) {
-                foreach ($structure['subnodes'] as $node) {
-                    array_push($pathArray, $this->getCheckedNodes($node));
-                }
-            }
-            return $pathArray;
+        $element = $this->find(sprintf($this->openNode, $element), Locator::SELECTOR_XPATH);
+        if ($element->isVisible()) {
+            return;
+        }
+        $plusButton = $this->find(sprintf($this->closedNode, $element) . $this->input, Locator::SELECTOR_XPATH);
+        if ($plusButton->isVisible()) {
+            $plusButton->click();
+            $this->waitLoadChildren($element);
         }
-        return null;
     }
 
     /**
-     * Method for recursive walk array of checked elements.
-     * If element haven't subnodes, adds element's path to $checkedNodesPaths
+     * Get element label.
      *
-     * @param array $pathArray
-     * @param string $rootPath
+     * @param ElementInterface $element
      * @return string
      */
-    protected function getPathFromArray($pathArray, $rootPath = '')
+    protected function getElementLabel(ElementInterface $element)
     {
-        $path = '';
-        $rootPath = $rootPath == '' ? $pathArray[0] : $rootPath . '/' . $pathArray[0];
-        if (count($pathArray) > 1) {
-            for ($counter = 1; $counter < count($pathArray); $counter++) {
-                $path .= $this->getPathFromArray($pathArray[$counter], $rootPath);
-            }
-        } else {
-            $path = $rootPath;
-            $this->checkedNodesPaths[] = $path;
-        }
-        return $path;
+        return trim($element->getText());
     }
 
     /**
-     * Returns array of paths of all selected elements.
+     * Get structure.
      *
+     * @param int|null $level
      * @return array
      */
-    public function getValue()
+    public function getStructure($level = null)
     {
-        $pathsArray = [];
-        $structure = $this->getStructure();
-        foreach ($structure as $structureChunk) {
-            $pathsArray[] = $this->getCheckedNodes($structureChunk);
-        }
-        foreach ($pathsArray as $pathArray) {
-            $this->getPathFromArray($pathArray);
+        $nodesSelector = $this->getNodesSelector($level);
+        $nodes = $this->getElements($nodesSelector, Locator::SELECTOR_XPATH);
+
+        return $this->prepareValues($nodes);
+    }
+
+    /**
+     * Get nodes selector.
+     *
+     * @param int|null $level
+     * @return string
+     */
+    protected function getNodesSelector($level)
+    {
+        $selector = $this->rootElement;
+        if ($level !== null) {
+            for ($i = 1; $i < $level; $i++) {
+                $selector .= $this->level;
+            }
+            $selector .= $this->selectedLabelsByLevel;
+        } else {
+            $selector .= $this->selectedLabels;
         }
-        return array_filter($this->checkedNodesPaths);
+
+        return $selector;
     }
 }

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

@@ -27,6 +27,13 @@ class MultiselectlistElement extends MultiselectElement
      */
     protected $optionCheckedElement = './/*[contains(@class, "mselect-checked")]/following-sibling::span';
 
+    /**
+     * Option locator by value.
+     *
+     * @var string
+     */
+    protected $optionByValue = './/*[contains(@class,"mselect-list-item")]/label[contains(normalize-space(.), %s)]';
+
     /**
      * Select options by values in multiple select list
      *
@@ -107,4 +114,16 @@ public function getAllValues()
 
         return $optionsValue;
     }
+
+    /**
+     * Check whether value is visible in the list.
+     *
+     * @param string $value
+     * @return bool
+     */
+    public function isValueVisible($value)
+    {
+        $option = $this->find(sprintf($this->optionByValue, $this->escapeQuotes($value)), Locator::SELECTOR_XPATH);
+        return $option->isVisible();
+    }
 }

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

@@ -6,11 +6,9 @@
 
 namespace Magento\Mtf\Client\Element;
 
-use Magento\Framework\Webapi\Exception;
 use Magento\Mtf\Client\Locator;
 
 /**
- * Class SuggestElement
  * General class for suggest elements.
  */
 class SuggestElement extends SimpleElement
@@ -21,35 +19,35 @@ class SuggestElement extends SimpleElement
     const BACKSPACE = "\xEE\x80\x83";
 
     /**
-     * Selector suggest input
+     * Selector suggest input.
      *
      * @var string
      */
     protected $suggest = '.mage-suggest-inner > .search';
 
     /**
-     * Selector search result
+     * Selector search result.
      *
      * @var string
      */
     protected $searchResult = '.mage-suggest-dropdown';
 
     /**
-     * Selector item of search result
+     * Selector item of search result.
      *
      * @var string
      */
     protected $resultItem = './/ul/li/a[text()="%s"]';
 
     /**
-     * Suggest state loader
+     * Suggest state loader.
      *
      * @var string
      */
     protected $suggestStateLoader = '.mage-suggest-state-loading';
 
     /**
-     * Set value
+     * Set value.
      *
      * @param string $value
      * @return void
@@ -64,10 +62,7 @@ public function setValue($value)
             return;
         }
         foreach (str_split($value) as $symbol) {
-            $input = $this->find($this->suggest);
-            $input->click();
-            $input->keys([$symbol]);
-            $this->waitResult();
+            $this->keys([$symbol]);
             $searchedItem = $this->find(sprintf($this->resultItem, $value), Locator::SELECTOR_XPATH);
             if ($searchedItem->isVisible()) {
                 try {
@@ -81,6 +76,20 @@ public function setValue($value)
         }
     }
 
+    /**
+     * Send keys.
+     *
+     * @param array $keys
+     * @return void
+     */
+    public function keys(array $keys)
+    {
+        $input = $this->find($this->suggest);
+        $input->click();
+        $input->keys($keys);
+        $this->waitResult();
+    }
+
     /**
      * Clear value of element.
      *
@@ -95,7 +104,7 @@ protected function clear()
     }
 
     /**
-     * Wait for search result is visible
+     * Wait for search result is visible.
      *
      * @return void
      */
@@ -112,7 +121,7 @@ function () use ($browser, $selector) {
     }
 
     /**
-     * Get value
+     * Get value.
      *
      * @return string
      */
@@ -124,21 +133,25 @@ public function getValue()
     }
 
     /**
-     * Checking exist value in search result
+     * Checking exist value in search result.
      *
      * @param string $value
      * @return bool
      */
     public function isExistValueInSearchResult($value)
     {
-        $searchResult = $this->find($this->searchResult);
-
-        $this->find($this->suggest)->setValue($value);
-        $this->waitResult();
-        if (!$searchResult->isVisible()) {
-            return false;
+        $needle = $this->find($this->searchResult)->find(sprintf($this->resultItem, $value), Locator::SELECTOR_XPATH);
+        $keys = str_split($value);
+        $this->keys($keys);
+        if ($needle->isVisible()) {
+            try {
+                return true;
+            } catch (\Exception $e) {
+                // In parallel run on windows change the focus is lost on element
+                // that causes disappearing of attribute suggest list.
+            }
         }
 
-        return $searchResult->find(sprintf($this->resultItem, $value), Locator::SELECTOR_XPATH)->isVisible();
+        return false;
     }
 }