MAGETWO-69825: [GITHUB #9891] Subcategory "liquid-hand-soap" is not opened in category "soap"

- Resolve merge conflict

Author: VeronikaYarats

dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/CategoryTest.php

@@ -11,11 +11,13 @@
 use Magento\Catalog\Model\ResourceModel\Product;
 use Magento\Framework\App\Request\Http as HttpRequest;
 use Magento\Framework\Message\MessageInterface;
-use Magento\Store\Model\Store;
+use Magento\Catalog\Api\CategoryRepositoryInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Store\Model\Store;
 
 /**
- * Test class for \Magento\Catalog\Controller\Adminhtml\Category.
+ * Test for category backend actions
  *
  * @magentoAppArea adminhtml
  */
@@ -101,7 +103,43 @@ public function testSaveAction($inputData, $defaultAttributes, $attributesSaved
     }
 
     /**
-     * Test save action from product creation page.
+     * Check default value for category url path
+     *
+     * @magentoDbIsolation enabled
+     * @magentoDataFixture Magento/CatalogUrlRewrite/_files/categories.php
+     * @throws NoSuchEntityException
+     */
+    public function testDefaultValueForCategoryUrlPath()
+    {
+        $repository = $this->_objectManager->get(CategoryRepositoryInterface::class);
+        $categoryId = 3;
+        $category = $repository->get($categoryId);
+        $newUrlPath = 'test_url_path';
+        $defaultUrlPath = $category->getData('url_path');
+
+        // update url_path and check it
+        $category->setStoreId(1);
+        $category->setUrlKey($newUrlPath);
+        $category->setUrlPath($newUrlPath);
+        $repository->save($category);
+        $this->assertEquals($newUrlPath, $category->getUrlPath());
+
+        // set default url_path and check it
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
+        $postData = $category->getData();
+        $postData['use_default'] = [
+            'available_sort_by' => 1,
+            'default_sort_by' => 1,
+            'url_key' => 1,
+        ];
+        $this->getRequest()->setPostValue($postData);
+        $this->dispatch('backend/catalog/category/save');
+        $category = $repository->get($categoryId);
+        $this->assertEquals($defaultUrlPath, $category->getData('url_path'));
+    }
+
+    /**
+     * Test save action from product form page
      *
      * @param array $postData
      * @dataProvider categoryCreatedFromProductCreationPageDataProvider
@@ -138,6 +176,8 @@ public function testSaveActionFromProductCreationPage($postData)
     }
 
     /**
+     * Get category post data
+     *
      * @static
      * @return array
      */
@@ -182,6 +222,8 @@ public function testSuggestCategoriesActionNoSuggestions()
     }
 
     /**
+     * Save action data provider
+     *
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      * @return array
      */
@@ -430,6 +472,8 @@ public function testMoveAction($parentId, $childId, $childUrlKey, $grandChildId,
     }
 
     /**
+     * Move action data provider
+     *
      * @return array
      */
     public function moveActionDataProvider()
@@ -472,6 +516,8 @@ public function testSaveCategoryWithProductPosition(array $postData)
     }
 
     /**
+     * Save action data provider
+     *
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      * @return array
      */