Merge branch 'MAGETWO-49084' of github.corp.magento.com:magento-troll/magento2ce into TrollS51Bugfixes

Author: slopukhov

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

@@ -17,7 +17,7 @@ class SwitcherElement extends SimpleElement
      *
      * @var string
      */
-    protected $parentContainer = 'parent::div[@class="switcher"]';
+    protected $parentContainer = 'parent::div[@data-role="switcher"]';
 
     /**
      * Set value to Yes or No.

dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Category/CatalogCategory.php

@@ -25,7 +25,7 @@ class CatalogCategory extends Page
      *
      * @var string
      */
-    protected $formBlock = '.entry-edit';
+    protected $formBlock = '//div[contains(@data-bind, "category_form")]';
 
     /**
      * Categories tree block.
@@ -80,7 +80,7 @@ public function open(array $params = [])
     public function getFormBlock()
     {
         return Factory::getBlockFactory()->getMagentoCatalogAdminhtmlCategoryEditCategoryForm(
-            $this->browser->find($this->formBlock, Locator::SELECTOR_CSS)
+            $this->browser->find($this->formBlock, Locator::SELECTOR_XPATH)
         );
     }
 

dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Category/CatalogCategoryEdit.php

@@ -26,7 +26,7 @@ class CatalogCategoryEdit extends Page
      *
      * @var string
      */
-    protected $formBlock = '.entry-edit';
+    protected $formBlock = '//div[contains(@data-bind, "category_form")]';
 
     /**
      * Categories tree block.

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

@@ -69,7 +69,6 @@ public function __inject(CatalogCategoryIndex $catalogCategoryIndex, CatalogCate
      */
     public function test(Category $category, $addCategory)
     {
-        $this->markTestIncomplete('MAGETWO-48731');
         $this->catalogCategoryIndex->open();
         $this->catalogCategoryIndex->getTreeCategories()->selectCategory($category, false);
         $this->catalogCategoryIndex->getTreeCategories()->$addCategory();

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

@@ -138,7 +138,7 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertCategoryForm" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertCategoryPage" />
         </variation>
-        <variation name="CreateCategoryEntityTestVariation9_WithProducts" summary="Assign Products at the Category Level" ticketId="MAGETWO-16351">
+        <variation name="CreateCategoryEntityTestVariation8_WithProducts" summary="Assign Products at the Category Level" ticketId="MAGETWO-16351">
             <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test</data>
             <data name="addCategory" xsi:type="string">addSubcategory</data>
             <data name="category/data/parent_id/dataset" xsi:type="string">default_category</data>
@@ -149,7 +149,7 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertCategorySaveMessage" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertCategoryForAssignedProducts" />
         </variation>
-        <variation name="CreateCategoryEntityTestVariation10_ThreeNesting">
+        <variation name="CreateCategoryEntityTestVariation9_ThreeNesting">
             <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>