Merge remote-tracking branch 'origin/BUG#AC-2567' into spartans_pr_22062022

Author: glo80326

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

@@ -105,6 +105,7 @@ private function deleteObsoleteRewrites(Product $product): void
             $isGlobalScope = $product->getStoreId() == Store::DEFAULT_STORE_ID;
             $storesToRemove[] = $isGlobalScope ? $product->getStoreIds() : $product->getStoreId();
         }
+        $storesToRemove = array_filter($storesToRemove);
         if ($storesToRemove) {
             $this->urlPersist->deleteByData(
                 [
@@ -130,7 +131,6 @@ private function isWebsiteChanged(Product $product)
         return array_diff($oldWebsiteIds, $newWebsiteIds) || array_diff($newWebsiteIds, $oldWebsiteIds);
     }
 
-
     /**
      * Is product rewrites need to be updated
      *

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

@@ -11,6 +11,8 @@
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Fixture\DataFixtureStorage;
+use Magento\TestFramework\Fixture\DataFixtureStorageManager;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\UrlRewrite\Model\UrlFinderInterface;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
@@ -37,6 +39,11 @@ class ProductProcessUrlRewriteSavingObserverTest extends TestCase
      */
     private $productRepository;
 
+    /**
+     * @var DataFixtureStorage
+     */
+    private $fixtures;
+
     /**
      * Set up
      */
@@ -45,6 +52,7 @@ protected function setUp(): void
         $this->objectManager = Bootstrap::getObjectManager();
         $this->storeManager = $this->objectManager->get(StoreManagerInterface::class);
         $this->productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+        $this->fixtures = $this->objectManager->get(DataFixtureStorageManager::class)->getStorage();
     }
 
     /**
@@ -632,4 +640,46 @@ public function testChangeVisibilityLocalScope()
             $this->assertContainsEquals($row, $actual);
         }
     }
+
+    /**
+     * phpcs:disable Generic.Files.LineLength.TooLong
+     * @magentoDataFixture Magento\Store\Test\Fixture\Website as:website
+     * @magentoDataFixture Magento\Store\Test\Fixture\Group with:{"website_id":"$website.id$"} as:store_group
+     * @magentoDataFixture Magento\Store\Test\Fixture\Store with:{"store_group_id":"$store_group.id$"} as:store
+     * @magentoDataFixture Magento\Catalog\Test\Fixture\Product with:{"sku":"simple1","website_ids":[1,"$website.id$"]} as:product
+     * @magentoAppIsolation enabled
+     */
+    public function testRemoveProductFromAllWebsites(): void
+    {
+        $testStore1 = $this->storeManager->getStore('default');
+        $testStore2 = $this->fixtures->get('store');
+
+        $productFilter = [UrlRewrite::ENTITY_TYPE => 'product'];
+
+        /** @var Product $product*/
+        $product = $this->productRepository->get('simple1');
+        $product->setWebsiteIds([])
+            ->setVisibility(Visibility::VISIBILITY_NOT_VISIBLE);
+        $this->productRepository->save($product);
+        $unexpected = [
+            [
+                'request_path' => 'simple1.html',
+                'target_path' => 'catalog/product/view/id/' . $product->getId(),
+                'is_auto_generated' => 1,
+                'redirect_type' => 0,
+                'store_id' => $testStore1->getId(),
+            ],
+            [
+                'request_path' => 'simple1.html',
+                'target_path' => 'catalog/product/view/id/' . $product->getId(),
+                'is_auto_generated' => 1,
+                'redirect_type' => 0,
+                'store_id' => $testStore2->getId(),
+            ],
+        ];
+        $actual = $this->getActualResults($productFilter);
+        foreach ($unexpected as $row) {
+            $this->assertNotContains($row, $actual);
+        }
+    }
 }