Merge remote-tracking branch 'origin/MC-40371' into 2.4-develop-pr52

Author: Serhii Balko

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

@@ -67,13 +67,11 @@ public function afterChangeParent(
         $categoryStoreId = $category->getStoreId();
         foreach ($category->getStoreIds() as $storeId) {
             $category->setStoreId($storeId);
-            if (!$this->isGlobalScope($storeId)) {
-                $this->updateCategoryUrlKeyForStore($category);
-                $category->unsUrlPath();
-                $category->setUrlPath($this->categoryUrlPathGenerator->getUrlPath($category));
-                $category->getResource()->saveAttribute($category, 'url_path');
-                $this->updateUrlPathForChildren($category);
-            }
+            $this->updateCategoryUrlKeyForStore($category);
+            $category->unsUrlPath();
+            $category->setUrlPath($this->categoryUrlPathGenerator->getUrlPath($category));
+            $category->getResource()->saveAttribute($category, 'url_path');
+            $this->updateUrlPathForChildren($category);
         }
         $category->setStoreId($categoryStoreId);
 

app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/Plugin/Category/MoveTest.php

@@ -91,27 +91,26 @@ protected function setUp(): void
     public function testAfterChangeParent()
     {
         $urlPath = 'test/path';
-        $storeIds = [1];
+        $storeIds = [0, 1];
         $originalCategory = $this->getMockBuilder(Category::class)
             ->disableOriginalConstructor()
             ->getMock();
         $this->categoryFactory->method('create')
             ->willReturn($originalCategory);
-
         $this->categoryMock->method('getResource')
             ->willReturn($this->subjectMock);
         $this->categoryMock->expects($this->once())
             ->method('getStoreIds')
             ->willReturn($storeIds);
-        $this->childrenCategoriesProviderMock->expects($this->once())
+        $this->childrenCategoriesProviderMock->expects($this->exactly(2))
             ->method('getChildren')
             ->with($this->categoryMock, true)
             ->willReturn([]);
-        $this->categoryUrlPathGeneratorMock->expects($this->once())
+        $this->categoryUrlPathGeneratorMock->expects($this->exactly(2))
             ->method('getUrlPath')
             ->with($this->categoryMock)
             ->willReturn($urlPath);
-        $this->categoryMock->expects($this->once())
+        $this->categoryMock->expects($this->exactly(2))
             ->method('setUrlPath')
             ->with($urlPath);
         $this->assertSame(