MAGETWO-54184: Url rewrite do not use store view dependent data for product

Author: rganin

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

@@ -55,9 +55,14 @@ public function execute(\Magento\Framework\Event\Observer $observer)
                 UrlRewrite::ENTITY_ID => $product->getId(),
                 UrlRewrite::ENTITY_TYPE => ProductUrlRewriteGenerator::ENTITY_TYPE,
                 UrlRewrite::REDIRECT_TYPE => 0,
+                UrlRewrite::STORE_ID => $product->getStoreId()
             ]);
-            if ($product->isVisibleInSiteVisibility()) {
-                $this->urlPersist->replace($this->productUrlRewriteGenerator->generate($product));
+
+            $savedProduct = clone $product;
+            $savedProduct->load($product->getId());
+
+            if ($savedProduct->isVisibleInSiteVisibility()) {
+                $this->urlPersist->replace($this->productUrlRewriteGenerator->generate($savedProduct));
             }
         }
     }

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

@@ -68,7 +68,9 @@ protected function setUp()
                 'dataHasChangedFor',
                 'isVisibleInSiteVisibility',
                 'getIsChangedWebsites',
-                'getIsChangedCategories'
+                'getIsChangedCategories',
+                'load',
+                'getStoreId'
             ],
             [],
             '',
@@ -114,7 +116,9 @@ public function testUrlKeyDataProvider()
                 'isChangedCategories'   => false,
                 'visibilityResult'      => true,
                 'expectedDeleteCount'   => 1,
-                'expectedReplaceCount'  => 1
+                'expectedProdLoadCount' => 1,
+                'expectedReplaceCount'  => 1,
+
             ],
             'no chnages' => [
                 'isChangedUrlKey'       => false,
@@ -123,6 +127,7 @@ public function testUrlKeyDataProvider()
                 'isChangedCategories'   => false,
                 'visibilityResult'      => true,
                 'expectedDeleteCount'   => 0,
+                'expectedProdLoadCount' => 0,
                 'expectedReplaceCount'  => 0
             ],
             'visibility changed' => [
@@ -132,6 +137,7 @@ public function testUrlKeyDataProvider()
                 'isChangedCategories'   => false,
                 'visibilityResult'      => true,
                 'expectedDeleteCount'   => 1,
+                'expectedProdLoadCount' => 1,
                 'expectedReplaceCount'  => 1
             ],
             'websites changed' => [
@@ -141,6 +147,7 @@ public function testUrlKeyDataProvider()
                 'isChangedCategories'   => false,
                 'visibilityResult'      => true,
                 'expectedDeleteCount'   => 1,
+                'expectedProdLoadCount' => 1,
                 'expectedReplaceCount'  => 1
             ],
             'categories changed' => [
@@ -150,6 +157,7 @@ public function testUrlKeyDataProvider()
                 'isChangedCategories'   => true,
                 'visibilityResult'      => true,
                 'expectedDeleteCount'   => 1,
+                'expectedProdLoadCount' => 1,
                 'expectedReplaceCount'  => 1
             ],
             'url changed invisible' => [
@@ -159,6 +167,7 @@ public function testUrlKeyDataProvider()
                 'isChangedCategories'   => false,
                 'visibilityResult'      => false,
                 'expectedDeleteCount'   => 1,
+                'expectedProdLoadCount' => 1,
                 'expectedReplaceCount'  => 0
             ],
         ];
@@ -171,6 +180,7 @@ public function testUrlKeyDataProvider()
      * @param bool $isChangedCategories
      * @param bool $visibilityResult
      * @param int $expectedDeleteCount
+     * @param int $expectedProdLoadCount
      * @param int $expectedReplaceCount
      *
      * @dataProvider testUrlKeyDataProvider
@@ -182,8 +192,15 @@ public function testExecuteUrlKey(
         $isChangedCategories,
         $visibilityResult,
         $expectedDeleteCount,
+        $expectedProdLoadCount,
         $expectedReplaceCount
     ) {
+        $this->product->expects($this->any())->method('getStoreId')->will($this->returnValue(12));
+
+        $this->product->expects($this->exactly($expectedProdLoadCount))
+            ->method('load')
+            ->with($this->product->getId());
+
         $this->product->expects($this->any())
             ->method('dataHasChangedFor')
             ->will($this->returnValueMap(
@@ -205,6 +222,7 @@ public function testExecuteUrlKey(
             UrlRewrite::ENTITY_ID => $this->product->getId(),
             UrlRewrite::ENTITY_TYPE => ProductUrlRewriteGenerator::ENTITY_TYPE,
             UrlRewrite::REDIRECT_TYPE => 0,
+            UrlRewrite::STORE_ID => $this->product->getStoreId()
         ]);
 
         $this->product->expects($this->any())