MTA-2257: Add an ability to specify several values for one tag type

Author: orykh

CHANGELOG.md

@@ -1,3 +1,5 @@
+* Add an ability to specify several values for one tag type
+
 1.0.0-rc.26
 =============
 * Removed code duplication in generators

Magento/Mtf/Client/Driver/Selenium/Driver.php

@@ -837,7 +837,7 @@ public function focus(ElementInterface $element)
     {
         $elementId = $element->getAttribute('id');
         if ($elementId) {
-            $js = "if (window.jQuery != undefined) jQuery('#$elementId').focus(); ";
+            $js = "if (window.jQuery != undefined) jQuery('[id=\"$elementId\"').focus(); ";
             $js .= "var element = document.getElementById('$elementId'); if (element != undefined) element.focus();";
             $this->driver->execute(['script' => $js,'args' => []]);
         } else {

Magento/Mtf/Util/CrossModuleReference/Common.php

@@ -25,11 +25,10 @@ class Common
     protected function mapClassNameToNamespace($className)
     {
         $pieces = explode('\\', $className);
+        end($pieces);
+        unset($pieces[key($pieces)]);
 
-        if (strpos($className, '\\') == 0) {
-            return $pieces[1];
-        }
-        return $pieces[0];
+        return implode('\\', $pieces);
     }
 
     /**

Magento/Mtf/Util/Filter/AbstractClassName.php

@@ -19,12 +19,24 @@ class AbstractClassName extends AbstractFilter implements FilterInterface
      */
     public function apply($class)
     {
-        if ($this->allow && !array_key_exists($class, $this->allow)) {
-            return false;
+        $testStatus = true;
+
+        if ($this->allow && is_array($this->allow)) {
+            foreach ($this->allow as $allow) {
+                if ($class === trim($allow['value'], '\\')) {
+                    $testStatus = true;
+                    break;
+                }
+                $testStatus = false;
+            }
         }
-        if ($this->deny && array_key_exists($class, $this->deny)) {
-            return false;
+        if ($this->deny && is_array($this->deny)) {
+            foreach ($this->deny as $deny) {
+                if ($class === trim($deny['value'], '\\')) {
+                    $testStatus = false;
+                }
+            }
         }
-        return true;
+        return $testStatus;
     }
 }

Magento/Mtf/Util/Filter/AbstractClassNamespace.php

@@ -20,13 +20,25 @@ abstract class AbstractClassNamespace extends AbstractFilter implements FilterIn
     public function apply($class)
     {
         $namespace = $this->mapClassNameToNamespace($class);
+        $testStatus = true;
 
-        if ($this->allow && !array_key_exists($namespace, $this->allow)) {
-            return false;
+        if ($this->allow && is_array($this->allow)) {
+            foreach (array_keys($this->allow) as $allow) {
+                if ($namespace === trim($allow, '\\')) {
+                    $testStatus = true;
+                    break;
+                }
+                $testStatus = false;
+            }
         }
-        if ($this->deny && array_key_exists($namespace, $this->deny)) {
-            return false;
+        if ($this->deny && is_array($this->deny)) {
+            foreach (array_keys($this->deny) as $deny) {
+                if ($namespace === trim($deny, '\\')) {
+                    $testStatus = false;
+                }
+            }
         }
-        return true;
+
+        return $testStatus;
     }
 }

Magento/Mtf/Util/Filter/AbstractFilterTag.php

@@ -49,11 +49,16 @@ public function processApply(array $tags)
      */
     protected function inTags(array $needleTags, array $stackTags)
     {
-        if (empty($needleTags) && in_array(self::UNDEFINED_TAG, $stackTags)) {
+        $tags = [];
+        foreach ($stackTags as $value) {
+            $tags = array_merge($tags, explode(', ', $value));
+        }
+
+        if (empty($needleTags) && in_array(self::UNDEFINED_TAG, $tags)) {
             return true;
         }
         foreach ($needleTags as $needleTag) {
-            if (in_array($needleTag, $stackTags)) {
+            if (in_array($needleTag, $tags)) {
                 return true;
             }
         }