ACP2E-2629: add integration test

Author: alzota

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

@@ -182,16 +182,18 @@ public function generateForGlobalScope($productCategories, Product $product, $ro
                         );
                     }
                 } else {
-                    $scopedProduct = $this->productRepository->getById($productId, false, $id);
-                    $mergeDataProvider->merge(
-                        $this->generateForSpecificStoreView(
-                            $id,
-                            $productCategories,
-                            $scopedProduct,
-                            $rootCategoryId,
-                            true
-                        )
-                    );
+                    if (count($visibleForStores) == 0 || in_array((int)$id, $visibleForStores)) {
+                        $scopedProduct = $this->productRepository->getById($productId, false, $id);
+                        $mergeDataProvider->merge(
+                            $this->generateForSpecificStoreView(
+                                $id,
+                                $productCategories,
+                                $scopedProduct,
+                                $rootCategoryId,
+                                true
+                            )
+                        );
+                    }
                 }
             }
         }

dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Observer/ProductProcessUrlRewriteSavingObserverTest.php

@@ -739,7 +739,7 @@ public function testNotVisibleOnDefaultStoreVisibleOnDefaultScope()
         $this->productRepository->save($product);
 
         $actualResults = $this->getActualResults($productFilter);
-        $this->assertGreaterThanOrEqual(2, $actualResults);
+        $this->assertCount(2, $actualResults);
 
         $expected = [
             [
@@ -761,4 +761,94 @@ public function testNotVisibleOnDefaultStoreVisibleOnDefaultScope()
             $this->assertContains($row, $actualResults);
         }
     }
+
+    #[
+        DataFixture(StoreFixture::class, ['group_id' => 1, 'website_id' => 1], as: 'store2'),
+        DataFixture(CategoryFixture::class, as: 'category'),
+        DataFixture(ProductFixture::class, ['category_ids' => ['$category.id$']], as: 'product')
+    ]
+    public function testUrlRewriteGenerationBasedOnScopeVisibility() {
+        $secondStore = $this->fixtures->get('store2');
+        $category = $this->fixtures->get('category');
+        $product = $this->fixtures->get('product');
+
+        $productFilter = [
+            UrlRewrite::ENTITY_TYPE => 'product',
+            'entity_id' => $product->getId(),
+            'store_id' => [1, $secondStore->getId()]
+        ];
+
+        $actualResults = $this->getActualResults($productFilter);
+        $this->assertCount(4, $actualResults);
+
+        $productScopeStore1 = $this->productRepository->get($product->getSku(), true, 1);
+        $productScopeStore1->setVisibility(Visibility::VISIBILITY_NOT_VISIBLE);
+        $this->productRepository->save($productScopeStore1);
+
+        $actualResults = $this->getActualResults($productFilter);
+        $this->assertCount(2, $actualResults);
+
+        $productGlobal = $this->productRepository->get($product->getSku(), true, Store::DEFAULT_STORE_ID);
+        $productGlobal->setVisibility(Visibility::VISIBILITY_IN_CATALOG);
+        $this->productRepository->save($productGlobal);
+
+        $actualResults = $this->getActualResults($productFilter);
+        $this->assertCount(2, $actualResults);
+
+        $expected = [
+            [
+                'request_path' => $product->getUrlKey() . '.html',
+                'target_path' => 'catalog/product/view/id/' . $product->getId(),
+                'is_auto_generated' => 1,
+                'redirect_type' => 0,
+                'store_id' => $secondStore->getId(),
+            ],
+            [
+                'request_path' => $category->getUrlKey() . '/' . $product->getUrlKey() . '.html',
+                'target_path' => 'catalog/product/view/id/' . $product->getId() . '/category/' . $category->getId(),
+                'is_auto_generated' => 1,
+                'redirect_type' => 0,
+                'store_id' => $secondStore->getId(),
+            ]
+        ];
+
+        $unexpected = [
+            [
+                'request_path' => $product->getUrlKey() . '.html',
+                'target_path' => 'catalog/product/view/id/' . $product->getId(),
+                'is_auto_generated' => 1,
+                'redirect_type' => 0,
+                'store_id' => 1 //not expected url rewrite for store 1
+            ],
+            [
+                'request_path' => $category->getUrlKey() . '/' . $product->getUrlKey() . '.html',
+                'target_path' => 'catalog/product/view/id/' . $product->getId() . '/category/' . $category->getId(),
+                'is_auto_generated' => 1,
+                'redirect_type' => 0,
+                'store_id' => 1,
+            ],
+            [
+                'request_path' => '/'.$product->getUrlKey() . '.html',// not expected anchor root category url rewrite
+                'target_path' => 'catalog/product/view/id/' . $product->getId(),
+                'is_auto_generated' => 1,
+                'redirect_type' => 0,
+                'store_id' => $secondStore->getId(),
+            ],
+            [
+                'request_path' => '/'.$product->getUrlKey() . '.html',// not expected anchor root category url rewrite
+                'target_path' => 'catalog/product/view/id/' . $product->getId(),
+                'is_auto_generated' => 1,
+                'redirect_type' => 0,
+                'store_id' => 1,
+            ]
+        ];
+
+        foreach ($expected as $row) {
+            $this->assertContains($row, $actualResults);
+        }
+
+        foreach ($unexpected as $row) {
+            $this->assertNotContains($row, $actualResults);
+        }
+    }
 }