MAGETWO-87526: URL rewrite for store is not created for child if parent category has non-default URL key on store

Author: le0n4eg

app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Category/Save.php

@@ -94,7 +94,7 @@ public function aroundSave(
     }
 
     /**
-     * Check is global scope
+     * Check that store id is in global scope
      *
      * @param int|null $storeId
      * @return bool

dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryTest.php

@@ -320,6 +320,44 @@ public function testDeleteChildren()
         $this->assertEquals($this->_model->getId(), null);
     }
 
+    /**
+     * @magentoDataFixture Magento/Store/_files/second_store.php
+     * @magentoDataFixture Magento/Catalog/_files/categories.php
+     * @magentoDbIsolation enabled
+     */
+    public function testCreateSubcategoryWithMultipleStores()
+    {
+        $parentCategoryId = 3;
+        $storeManager = $this->objectManager->get(\Magento\Store\Model\StoreManagerInterface::class);
+        $storeManager->setCurrentStore(\Magento\Store\Model\Store::ADMIN_CODE);
+        /** @var \Magento\Store\Api\StoreRepositoryInterface $storeRepository */
+        $storeRepository = $this->objectManager->get(\Magento\Store\Api\StoreRepositoryInterface::class);
+        $storeId = $storeRepository->get('fixture_second_store')->getId();
+        /** @var \Magento\Catalog\Api\CategoryRepositoryInterface $repository */
+        $repository = $this->objectManager->get(\Magento\Catalog\Api\CategoryRepositoryInterface::class);
+        $parentCategory = $repository->get($parentCategoryId, $storeId);
+        $parentAllStoresPath = $parentCategory->getUrlPath();
+        $parentSecondStoreKey = 'parent-category-url-key-second-store';
+        $parentCategory->setUrlKey($parentSecondStoreKey);
+        $repository->save($parentCategory);
+        /** @var \Magento\Catalog\Model\Category $childCategory */
+        $childCategory = $this->objectManager->create(\Magento\Catalog\Model\Category::class);
+        $childCategory->setName('Test Category 100')
+            ->setParentId($parentCategoryId)
+            ->setLevel(2)
+            ->setAvailableSortBy(['position', 'name'])
+            ->setDefaultSortBy('name')
+            ->setIsActive(true)
+            ->setPosition(1)
+            ->isObjectNew(true);
+        $repository->save($childCategory);
+        $childCategorySecondStore = $repository->get($childCategory->getId(), $storeId);
+
+        $this->assertEquals($parentAllStoresPath . '/test-category-100', $childCategory->getUrlPath());
+        $this->assertEquals($parentSecondStoreKey . '/test-category-100', $childCategorySecondStore->getUrlPath());
+
+    }
+
     protected function getCategoryByName($categoryName)
     {
         /* @var \Magento\Catalog\Model\ResourceModel\Category\Collection $collection */