ENGCOM-6124: Fixes #25120 stores the attribute url_path for non-default Stores #25143

Author: VladimirZaets

app/code/Magento/CatalogUrlRewrite/Observer/CategoryUrlPathAutogeneratorObserver.php

@@ -94,7 +94,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             $resultUrlKey = $this->categoryUrlPathGenerator->getUrlKey($category);
             $this->updateUrlKey($category, $resultUrlKey);
         } elseif ($useDefaultAttribute) {
-            if (!$category->isObjectNew()) {
+            if (!$category->isObjectNew() && $category->getStoreId() === Store::DEFAULT_STORE_ID) {
                 $resultUrlKey = $category->formatUrlKey($category->getOrigData('name'));
                 $this->updateUrlKey($category, $resultUrlKey);
             }

app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/CategoryUrlPathAutogeneratorObserverTest.php

@@ -159,6 +159,9 @@ public function testShouldThrowExceptionIfUrlKeyIsEmpty($useDefaultUrlKey, $isOb
         $this->expectExceptionMessage('Invalid URL key');
         $categoryData = ['use_default' => ['url_key' => $useDefaultUrlKey], 'url_key' => '', 'url_path' => ''];
         $this->category->setData($categoryData);
+        $this->category
+            ->method('getStoreId')
+            ->willReturn(\Magento\Store\Model\Store::DEFAULT_STORE_ID);
         $this->category->isObjectNew($isObjectNew);
         $this->assertEquals($isObjectNew, $this->category->isObjectNew());
         $this->assertEquals($categoryData['url_key'], $this->category->getUrlKey());

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

@@ -15,8 +15,8 @@
 use Magento\Framework\Message\MessageInterface;
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Store\Api\StoreRepositoryInterface;
-use Magento\TestFramework\TestCase\AbstractBackendController;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\AbstractBackendController;
 
 /**
  * Test for category backend actions
@@ -63,6 +63,7 @@ protected function setUp()
      * @param array $defaultAttributes
      * @param array $attributesSaved
      * @return void
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function testSaveAction(array $inputData, array $defaultAttributes, array $attributesSaved = []): void
     {
@@ -107,6 +108,8 @@ public function testSaveAction(array $inputData, array $defaultAttributes, array
      * @magentoDbIsolation enabled
      * @magentoDataFixture Magento/CatalogUrlRewrite/_files/categories.php
      * @return void
+     * @throws \Magento\Framework\Exception\CouldNotSaveException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function testDefaultValueForCategoryUrlPath(): void
     {
@@ -125,19 +128,20 @@ public function testDefaultValueForCategoryUrlPath(): void
         // 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,
-        ];
+        $postData['use_default'] =
+            [
+                'available_sort_by' => 1,
+                'default_sort_by' => 1,
+                'url_key' => 1,
+            ];
         $this->getRequest()->setPostValue($postData);
         $this->dispatch('backend/catalog/category/save');
         $this->assertSessionMessages(
             $this->equalTo([(string)__('You saved the category.')]),
             MessageInterface::TYPE_SUCCESS
         );
         $category = $this->categoryRepository->get($categoryId);
-        $this->assertEquals($defaultUrlPath, $category->getData('url_path'));
+        $this->assertEquals($defaultUrlPath, $category->getData('url_key'));
     }
 
     /**