MTO-95: PRs stabilization

- Product form filling issue fixed
- Wrong parsing sort options issue fixed
- The creation new category  implemented (MAGETWO-58108)
- Issue tag added (MAGETWO-60635)
- "to_maintain:yes" tag removed (MAGETWO-60635)
- Added suppress warning annotation to skip static test fail related with a coupling between objects

Author: Vadim Zubovich

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

@@ -14,9 +14,12 @@
 use Magento\Mtf\Client\Locator;
 use Magento\Mtf\Fixture\FixtureInterface;
 use Magento\Ui\Test\Block\Adminhtml\DataGrid;
+use Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Section\ProductDetails\NewCategoryIds;
 
 /**
  * Product form on backend product page.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class ProductForm extends FormSections
 {
@@ -48,6 +51,13 @@ class ProductForm extends FormSections
      */
     protected $attributeBlock = '[data-index="%s"]';
 
+    /**
+     * NewCategoryIds block selector.
+     *
+     * @var string
+     */
+    protected $newCategoryModalForm = '.product_form_product_form_create_category_modal';
+
     /**
      * Magento form loader.
      *
@@ -70,8 +80,6 @@ class ProductForm extends FormSections
      * @param FixtureInterface|null $category
      * @return $this
      * @throws \Exception
-     *
-     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function fill(FixtureInterface $product, SimpleElement $element = null, FixtureInterface $category = null)
     {
@@ -88,9 +96,14 @@ public function fill(FixtureInterface $product, SimpleElement $element = null, F
             $this->callRender($typeId, 'fill', $renderArguments);
         } else {
             $sections = $this->getFixtureFieldsByContainers($product);
-
+            $category = $product->hasData('category_ids')
+                ? $product->getDataFieldConfig('category_ids')['source']->getCategories()[0] : $category;
             if ($category) {
-                $sections['product-details']['category_ids']['value'] = $category->getName();
+                if ((int)$category->getId()) {
+                    $sections['product-details']['category_ids']['value'] = $category->getName();
+                } else {
+                    $this->getNewCategoryModalForm()->addNewCategory($category);
+                }
             }
             $this->fillContainers($sections, $element);
         }
@@ -193,6 +206,19 @@ public function getAttributeForm()
         );
     }
 
+    /**
+     * Get New Category Modal Form.
+     *
+     * @return NewCategoryIds
+     */
+    public function getNewCategoryModalForm()
+    {
+        return $this->blockFactory->create(
+            \Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Section\ProductDetails\NewCategoryIds::class,
+            ['element' => $this->browser->find($this->newCategoryModalForm)]
+        );
+    }
+
     /**
      * Get attribute element.
      *

dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/TopToolbar.php

@@ -36,12 +36,11 @@ public function getSelectSortType()
     /**
      * Get all available method of sorting product
      *
-     * @return array|string
+     * @return array
      */
     public function getSortType()
     {
         $content = $this->_rootElement->find($this->sorter)->getText();
-        preg_match_all('/\w+\s?\w+/', $content, $matches);
-        return $matches[0];
+        return explode("\n", $content);
     }
 }

dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/CreateCategoryEntityTest.xml

@@ -16,7 +16,7 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertCategoryForm" />
         </variation>
         <variation name="CreateCategoryEntityTestVariation2_RootCategory_AllFields">
-            <data name="tag" xsi:type="string">to_maintain:yes</data>
+            <data name="issue" xsi:type="string">MAGETWO-60635: [CE][Categories] Design update dates are incorrect after save</data>
             <data name="description" xsi:type="string">Create root category with all fields</data>
             <data name="addCategory" xsi:type="string">addRootCategory</data>
             <data name="category/data/is_active" xsi:type="string">Yes</data>
@@ -57,7 +57,7 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertCategoryPage" />
         </variation>
         <variation name="CreateCategoryEntityTestVariation4_Subcategory_AllFields">
-            <data name="tag" xsi:type="string">to_maintain:yes</data>
+            <data name="issue" xsi:type="string">MAGETWO-60635: [CE][Categories] Design update dates are incorrect after save</data>
             <data name="description" xsi:type="string">Create not anchor subcategory specifying all fields</data>
             <data name="addCategory" xsi:type="string">addSubcategory</data>
             <data name="category/data/parent_id/dataset" xsi:type="string">default_category</data>
@@ -94,7 +94,6 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertCategoryForAssignedProducts" />
         </variation>
         <variation name="CreateCategoryEntityTestVariation5_Anchor_MostOfFields">
-            <data name="tag" xsi:type="string">to_maintain:yes</data>
             <data name="description" xsi:type="string">Create anchor subcategory with all fields</data>
             <data name="addCategory" xsi:type="string">addSubcategory</data>
             <data name="category/data/parent_id/dataset" xsi:type="string">default_category</data>
@@ -155,7 +154,7 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertCategoryForAssignedProducts" />
         </variation>
         <variation name="CreateCategoryEntityTestVariation9_ThreeNesting">
-            <data name="tag" xsi:type="string">test_type:extended_acceptance_test, to_maintain:yes</data>
+            <data name="tag" xsi:type="string">test_type:extended_acceptance_test</data>
             <data name="description" xsi:type="string">Create category with three nesting</data>
             <data name="addCategory" xsi:type="string">addSubcategory</data>
             <data name="category/data/parent_id/dataset" xsi:type="string">two_nested_categories</data>