Corrected issue causing integration test to fail when category move is tested

Author: Barny Shergold

app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGenerator.php

@@ -73,10 +73,7 @@ public function getUrlPath($category, $parentCategory = null)
         if (in_array($category->getParentId(), [Category::ROOT_CATEGORY_ID, Category::TREE_ROOT_ID])) {
             return '';
         }
-        $path = $category->getUrlPath();
-        if ($path !== null && !$category->dataHasChangedFor('url_key') && !$category->dataHasChangedFor('parent_id')) {
-            return $path;
-        }
+
         $path = $category->getUrlKey();
         if ($path === false) {
             return $category->getUrlPath();

app/code/Magento/CatalogUrlRewrite/Model/ProductScopeRewriteGenerator.php

@@ -177,9 +177,7 @@ public function generateForSpecificStoreView($storeId, $productCategories, Produ
                 continue;
             }
 
-            // Category should be loaded per appropriate store at all times. This is because whilst the URL key on the
-            // category in focus might be unchanged, parent category URL keys might be
-            $categories[] =  $this->categoryRepository->get($category->getEntityId(), $storeId);
+            $categories[] = $this->getCategoryWithOverriddenUrlKey($storeId, $category);
         }
 
         $productCategories = $this->objectRegistryFactory->create(['entities' => $categories]);
@@ -238,6 +236,35 @@ public function isCategoryProperForGenerating(Category $category, $storeId)
         return false;
     }
 
+    /**
+     * Check if URL key has been changed
+     *
+     * Checks if URL key has been changed for provided category and returns reloaded category,
+     * in other case - returns provided category.
+     *
+     * @param int $storeId
+     * @param Category $category
+     * @return Category
+     */
+    private function getCategoryWithOverriddenUrlKey($storeId, Category $category)
+    {
+        $isUrlKeyOverridden = $this->storeViewService->doesEntityHaveOverriddenUrlKeyForStore(
+            $storeId,
+            $category->getEntityId(),
+            Category::ENTITY
+        );
+
+        // Category should be loaded per appropriate store at all times. This is because whilst the URL key on the
+        // category in focus might be unchanged, parent category URL keys might be. If the category store ID
+        // and passed store ID are the same then return current category as it is correct but may have changed in memory
+
+        if (!$isUrlKeyOverridden && $storeId == $category->getStoreId()) {
+            return $category;
+        }
+
+        return $this->categoryRepository->get($category->getEntityId(), $storeId);
+    }
+
     /**
      * Check config value of generate_category_product_rewrites
      *