MTA-552: Re-factor Test for Create Product with New Category

- Fixed fill category on product page

Author: orykh

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

@@ -52,7 +52,7 @@ public function __construct(
         BrowserInterface $browser,
         XmlConverter $xmlConverter,
         array $config = []
-    ){
+    ) {
         parent::__construct($element, $mapper, $blockFactory, $browser, $xmlConverter, $config);
         $this->browser->switchToFrame(new Locator($this->iFrame));
     }

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

@@ -30,6 +30,13 @@ class ProductDetails extends ProductTab
      */
     protected $categoryFollowingSibling = '//*[@id="attribute-category_ids-container"]/following-sibling::div[%d]';
 
+    /**
+     * Locator for following sibling of category element.
+     *
+     * @var string
+     */
+    protected $newCategoryRootElement = 'body';
+
     /**
      * Fill data to fields on tab.
      *
@@ -48,7 +55,7 @@ public function fillFormTab(array $fields, SimpleElement $element = null)
             ) {
                 $this->blockFactory->create(
                     'Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\ProductDetails\NewCategoryIds',
-                    ['element' => $this->browser->find('body')]
+                    ['element' => $this->browser->find($this->newCategoryRootElement)]
                 )->addNewCategory($fields['category_ids']['source']->getCategories()[0]);
             } else {
                 $this->_fill([$data['category_ids']], $element);

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

@@ -6,7 +6,6 @@
 
 namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\ProductDetails;
 
-use Magento\Mtf\Client\Locator;
 use Magento\Catalog\Test\Fixture\Category;
 use Magento\Backend\Test\Block\Widget\Form;
 
@@ -51,32 +50,18 @@ class NewCategoryIds extends Form
      */
     public function addNewCategory(Category $category)
     {
-        $parentCategory = $category->getDataFieldConfig('parent_id')['source']->getParentCategory()->getName();
+        $data = [
+            'name' => $category->getName(),
+            'parent_category' => $category->getDataFieldConfig('parent_id')['source']->getParentCategory()->getName()
+        ];
 
         $this->openNewCategoryDialog();
-        $this->fill($category);
-
-        $this->selectParentCategory($parentCategory);
+        $this->_fill($this->dataMapping($data));
 
         $this->_rootElement->find($this->createCategoryButton)->click();
         $this->waitForElementNotVisible($this->createCategoryButton);
     }
 
-    /**
-     * Select parent category for new one.
-     *
-     * @param string $categoryName
-     * @return void
-     */
-    protected function selectParentCategory($categoryName)
-    {
-        $this->_rootElement->find(
-            $this->parentCategoryBlock,
-            Locator::SELECTOR_CSS,
-            '\Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\ProductDetails\ParentCategoryIds'
-        )->setValue($categoryName);
-    }
-
     /**
      * Open new category dialog.
      *

dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails/NewCategoryIds.xml

@@ -10,5 +10,9 @@
         <name>
             <selector>[name="new_category_name"]</selector>
         </name>
+        <parent_category>
+            <selector>.field-new_category_parent</selector>
+            <class>Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\ProductDetails\ParentCategoryIds</class>
+        </parent_category>
     </fields>
 </mapping>

dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableProductEntityTest.php

@@ -40,6 +40,7 @@ class CreateConfigurableProductEntityTest extends Injectable
 {
     /* tags */
     const TEST_TYPE = 'acceptance_test';
+    const STABLE = 'no';
     const MVP = 'yes';
     const DOMAIN = 'MX';
     /* end tags */