MTA-3333: Deliver functional test fixes that were made during regression testing

Author: SmolyarO

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

@@ -6,6 +6,8 @@
 
 namespace Magento\Mtf\Client\Element;
 
+use Magento\Mtf\Client\Locator;
+
 /**
  * Toggle element in the backend.
  * Switches value between YES and NO.
@@ -19,6 +21,13 @@ class SwitcherElement extends SimpleElement
      */
     protected $parentContainer = 'parent::div[@data-role="switcher"]';
 
+    /**
+     * XPath selector for label text on swticher element.
+     *
+     * @var string
+     */
+    private $labelText = './following-sibling::label';
+
     /**
      * Set value to Yes or No.
      *
@@ -33,7 +42,7 @@ public function setValue($value)
             );
         }
         if ($value != $this->getValue()) {
-            $this->click();
+            $this->find($this->labelText, Locator::SELECTOR_XPATH)->click();
         }
     }
 

dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Section/AdvancedInventory.php

@@ -61,4 +61,27 @@ public function getFieldsData($fields = null, SimpleElement $element = null)
 
         return $data;
     }
+
+    /**
+     * Get data of specified form data.
+     *
+     * @param array $fields
+     * @param SimpleElement|null $element
+     * @return array
+     */
+    protected function _getData(array $fields, SimpleElement $element = null)
+    {
+        $data = [];
+        $context = ($element === null) ? $this->_rootElement : $element;
+        foreach ($fields as $key => $field) {
+            if (!isset($field['value'])) {
+                $data[$key] = $this->_getData($field, $context);
+            } else {
+                $element = $this->getElement($context, $field);
+                $data[$key] = $element->getValue();
+            }
+        }
+
+        return $data;
+    }
 }

dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Section/Options/Type.php

@@ -49,8 +49,11 @@ class Type extends OptgroupselectElement
      */
     protected function getData(ElementInterface $element)
     {
-        $this->find($this->advancedSelect)->click();
-        return trim($element->getText());
+        $element = $this->find($this->advancedSelect);
+        $element->click();
+        $text = trim($element->getText());
+        $element->click();
+        return $text;
     }
 
     /**

dev/tests/functional/tests/app/Magento/Cms/Test/Block/Adminhtml/Page/Edit/PageForm.xml

@@ -13,7 +13,6 @@
         <fields>
             <title />
             <is_active>
-                <selector>.admin__actions-switch-label</selector>
                 <input>switcher</input>
             </is_active>
         </fields>