Merge branch 'MTA-1499' into develop

Conflicts:
	dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/AttributeForm.php
	dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails.php

Author: Dmytro Aponasenko

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

@@ -9,35 +9,62 @@
 use Magento\Mtf\Client\Locator;
 
 /**
- * Class OptgroupselectElement
- * Typified element class for option group selectors
+ * Typified element class for option group selectors.
  */
 class OptgroupselectElement extends SelectElement
 {
     /**
-     * Option group selector
+     * Option locator.
+     *
+     * @var string
+     */
+    protected $optionByIndex = './/option';
+
+    /**
+     * Option group selector.
      *
      * @var string
      */
     protected $optGroup = 'optgroup[option[contains(.,"%s")]]';
 
     /**
-     * Get the value of form element
+     * Option group locator.
+     *
+     * @var string
+     */
+    protected $optionGroupValue = ".//optgroup[@label = '%s']/option[text() = '%s']";
+
+    /**
+     * Get the value of form element.
      *
      * @return string
+     * @throws \Exception
      */
     public function getValue()
     {
         $this->eventManager->dispatchEvent(['get_value'], [(string)$this->getAbsoluteSelector()]);
-        $selectedLabel = trim(parent::getValue());
+
+        $selectedLabel = '';
+        $labels = $this->getElements($this->optionByIndex, Locator::SELECTOR_XPATH);
+        foreach ($labels as $label) {
+            if ($label->isSelected()) {
+                $selectedLabel = $label->getText();
+                break;
+            }
+        }
+        if ($selectedLabel == '') {
+            throw new \Exception('Selected value has not been found in optgroup select.');
+        }
+
         $element = $this->find(sprintf($this->optGroup, $selectedLabel), Locator::SELECTOR_XPATH);
         $value = trim($element->getAttribute('label'), chr(0xC2) . chr(0xA0));
         $value .= '/' . $selectedLabel;
+
         return $value;
     }
 
     /**
-     * Select value in dropdown which has option groups
+     * Select value in dropdown which has option groups.
      *
      * @param string $value
      * @return void
@@ -46,6 +73,8 @@ public function setValue($value)
     {
         $this->eventManager->dispatchEvent(['set_value'], [__METHOD__, $this->getAbsoluteSelector()]);
         list($group, $option) = explode('/', $value);
-        parent::setOptionGroupValue($group, $option);
+        $xpath = sprintf($this->optionGroupValue, $group, $option);
+        $option = $this->find($xpath, Locator::SELECTOR_XPATH);
+        $option->click();
     }
 }

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

@@ -13,6 +13,13 @@
  */
 class SelectstoreElement extends SelectElement
 {
+    /**
+     * Option locator
+     *
+     * @var string
+     */
+    protected $optionByIndex = './/optgroup/option[%d]';
+
     /**
      * Store option group selector.
      *

dev/tests/functional/lib/Magento/Mtf/Util/Protocol/CurlTransport/FrontendDecorator.php

@@ -6,7 +6,7 @@
 
 namespace Magento\Mtf\Util\Protocol\CurlTransport;
 
-use Magento\Customer\Test\Fixture\CustomerInjectable;
+use Magento\Customer\Test\Fixture\Customer;
 use Magento\Mtf\Util\Protocol\CurlInterface;
 use Magento\Mtf\Util\Protocol\CurlTransport;
 
@@ -48,9 +48,9 @@ class FrontendDecorator implements CurlInterface
      * Constructor
      *
      * @param CurlTransport $transport
-     * @param CustomerInjectable $customer
+     * @param Customer $customer
      */
-    public function __construct(CurlTransport $transport, CustomerInjectable $customer)
+    public function __construct(CurlTransport $transport, Customer $customer)
     {
         $this->transport = $transport;
         $this->authorize($customer);
@@ -59,11 +59,11 @@ public function __construct(CurlTransport $transport, CustomerInjectable $custom
     /**
      * Authorize customer on frontend
      *
-     * @param CustomerInjectable $customer
+     * @param Customer $customer
      * @throws \Exception
      * @return void
      */
-    protected function authorize(CustomerInjectable $customer)
+    protected function authorize(Customer $customer)
     {
         $url = $_ENV['app_frontend_url'] . 'customer/account/login/';
         $this->transport->write(CurlInterface::POST, $url);

dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct/CheckoutData.php

@@ -70,10 +70,10 @@ protected function getPreset($name)
                         ],
                     ],
                 ],
-                'qty' => 2,
+                'qty' => 1,
                 'cartItem' => [
                     'price' => 756,
-                    'qty' => 2,
+                    'qty' => 1,
                     'subtotal' => 756,
                 ],
             ],

dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct/Price.php

@@ -92,6 +92,8 @@ public function getDataConfig()
      * Get preset array
      *
      * @return array|null
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function getPreset()
     {

dev/tests/functional/tests/app/Magento/Catalog/Test/Block/AbstractConfigureBlock.php

@@ -97,7 +97,7 @@ protected function prepareCheckoutData(array $options, array $checkoutData)
 
             if (isset($options[$attribute])) {
                 $result[] = [
-                    'type' => strtolower(preg_replace('/[^a-z]/i', '', $options[$attribute]['type'])),
+                    'type' => $options[$attribute]['type'],
                     'title' => isset($options[$attribute]['title'])
                             ? $options[$attribute]['title']
                             : $attribute,

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

@@ -36,6 +36,13 @@ class AttributeForm extends FormTabs
      */
     protected $saveButton = '#save';
 
+    /**
+     * Attribute to determine whether tab is opened.
+     *
+     * @var string
+     */
+    protected $isTabOpened = '.opened ';
+
     /**
      * @constructor
      * @param SimpleElement $element
@@ -88,8 +95,11 @@ public function openTab($tabName)
         $strategy = isset($this->tabs[$tabName]['strategy'])
             ? $this->tabs[$tabName]['strategy']
             : Locator::SELECTOR_CSS;
-        $tab = $this->_rootElement->find($selector, $strategy);
-        $tab->click();
+
+        $isTabOpened = $this->_rootElement->find($this->isTabOpened . $selector, $strategy);
+        if (!$isTabOpened->isVisible()) {
+            $this->_rootElement->find($selector, $strategy)->click();
+        }
 
         return $this;
     }

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

@@ -28,7 +28,7 @@
         </fields>
     </properties>
     <advanced-properties>
-        <class>\Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Edit\Tab\Advanced</class>
+        <class>\Magento\Backend\Test\Block\Widget\Tab</class>
         <selector>[data-target="#advanced_fieldset-content"]</selector>
         <strategy>css selector</strategy>
         <fields>

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

@@ -33,6 +33,13 @@ class AttributeForm extends FormTabs
      */
     protected $propertiesTab = '#product_attribute_tabs_main';
 
+    /**
+     * Page title.
+     *
+     * @var string
+     */
+    protected $pageTitle = '.page-title .title';
+
     /**
      * Get data of the tabs.
      *
@@ -94,15 +101,8 @@ protected function expandAllToggles()
      */
     public function openTab($tabName)
     {
-        $selector = $this->tabs[$tabName]['selector'];
-        $strategy = isset($this->tabs[$tabName]['strategy'])
-            ? $this->tabs[$tabName]['strategy']
-            : Locator::SELECTOR_CSS;
-        $tab = $this->_rootElement->find($selector, $strategy);
-        $target = $this->browser->find('.page-title .title');// Handle menu overlap problem
-        $this->_rootElement->dragAndDrop($target);
-        $tab->click();
-        return $this;
+        $this->browser->find($this->pageTitle)->click(); // Handle menu overlap problem
+        return parent::openTab($tabName);
     }
 
     /**

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

@@ -204,16 +204,17 @@ protected function prepareCustomOptions(array $options)
     /**
      * Convert option name
      *
-     * @param string $str
+     * @param string $inputType
      * @return string
      */
-    protected function optionNameConvert($str)
+    protected function optionNameConvert($inputType)
     {
-        $str = str_replace([' ', '&'], "", $str);
-        if ($end = strpos($str, '-')) {
-            $str = substr($str, 0, $end) . ucfirst(substr($str, ($end + 1)));
+        $option = substr($inputType, strpos($inputType, "/") + 1);
+        $option = str_replace([' ', '&'], "", $option);
+        if ($end = strpos($option, '-')) {
+            $option = substr($option, 0, $end) . ucfirst(substr($option, ($end + 1)));
         }
 
-        return $str;
+        return $option;
     }
 }