MAGETWO-67087: Saving category deletes url-rewrites for products in anchor categories

Author: slopukhov

dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGeneratorTest.php

@@ -10,6 +10,7 @@
 
 use Magento\UrlRewrite\Model\OptionProvider;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
+use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
 
 /**
  * @magentoAppArea adminhtml
@@ -25,7 +26,7 @@ protected function setUp()
     }
 
     /**
-     * @magentoDataFixture Magento/CatalogUrlRewrite/_files/categories.php
+     * @magentoDataFixture Magento/CatalogUrlRewrite/_files/categories_with_products.php
      * @magentoDbIsolation enabled
      * @magentoAppIsolation enabled
      */
@@ -50,11 +51,57 @@ public function testGenerateUrlRewritesWithoutSaveHistory()
         ];
 
         $this->assertResults($categoryExpectedResult, $actualResults);
+
+        $productIds = [];
+        foreach ($category->getProductCollection() as $product) {
+            $productIds = $product->getId();
+        }
+        $this->assertTrue(isset($productIds[0]), 'Product for testing does not exist');
+        $productForTest = $productIds[0];
+        $productFilter = [
+            UrlRewrite::ENTITY_TYPE => ProductUrlRewriteGenerator::ENTITY_TYPE,
+            UrlRewrite::ENTITY_ID => [$productForTest]
+        ];
+        $actualResults = $this->getActualResults($productFilter);
+        $productExpectedResult = [
+            [
+                'simple-product-two.html',
+                'catalog/product/view/id/' . $productForTest,
+                1,
+                0
+            ],
+            [
+                'new-url/category-1-1/category-1-1-1/simple-product-two.html',
+                'catalog/product/view/id/' . $productForTest . '/category/5',
+                1,
+                0
+            ],
+            [
+                'new-url/simple-product-two.html',
+                'catalog/product/view/id/' . $productForTest . '/category/3',
+                1,
+                0
+            ],
+            [
+                'new-url/category-1-1/simple-product-two.html',
+                'catalog/product/view/id/' . $productForTest . '/category/4',
+                1,
+                0
+            ],
+            [
+                '/simple-product-two.html',
+                'catalog/product/view/id/' . $productForTest . '/category/2',
+                1,
+                0
+            ]
+        ];
+
+        $this->assertResults($productExpectedResult, $actualResults);
     }
 
     /**
      * @magentoDbIsolation enabled
-     * @magentoDataFixture Magento/CatalogUrlRewrite/_files/categories.php
+     * @magentoDataFixture Magento/CatalogUrlRewrite/_files/categories_with_products.php
      * @magentoAppIsolation enabled
      */
     public function testGenerateUrlRewritesWithSaveHistory()
@@ -86,6 +133,70 @@ public function testGenerateUrlRewritesWithSaveHistory()
         ];
 
         $this->assertResults($categoryExpectedResult, $actualResults);
+
+        $productIds = [];
+        foreach ($category->getProductCollection() as $product) {
+            $productIds = $product->getId();
+        }
+        $this->assertTrue(isset($productIds[0]), 'Product for testing does not exist');
+        $productForTest = $productIds[0];
+        $productFilter = [
+            UrlRewrite::ENTITY_TYPE => ProductUrlRewriteGenerator::ENTITY_TYPE,
+            UrlRewrite::ENTITY_ID => [$productForTest]
+        ];
+        $actualResults = $this->getActualResults($productFilter);
+        $productExpectedResult = [
+            [
+                'simple-product-two.html',
+                'catalog/product/view/id/' . $productForTest,
+                1,
+                0
+            ],
+            [
+                'new-url/category-1-1/category-1-1-1/simple-product-two.html',
+                'catalog/product/view/id/' . $productForTest . '/category/5',
+                1,
+                0
+            ],
+            [
+                'category-1/category-1-1/category-1-1-1/simple-product-two.html',
+                'new-url/category-1-1/category-1-1-1/simple-product-two.html',
+                0,
+                OptionProvider::PERMANENT
+            ],
+            [
+                'new-url/simple-product-two.html',
+                'catalog/product/view/id/' . $productForTest . '/category/3',
+                1,
+                0
+            ],
+            [
+                'new-url/category-1-1/simple-product-two.html',
+                'catalog/product/view/id/' . $productForTest . '/category/4',
+                1,
+                0
+            ],
+            [
+                '/simple-product-two.html',
+                'catalog/product/view/id/' . $productForTest . '/category/2',
+                1,
+                0
+            ],
+            [
+                'category-1/simple-product-two.html',
+                'new-url/simple-product-two.html',
+                0,
+                OptionProvider::PERMANENT
+            ],
+            [
+                'category-1/category-1-1/simple-product-two.html',
+                'new-url/category-1-1/simple-product-two.html',
+                0,
+                OptionProvider::PERMANENT
+            ],
+        ];
+
+        $this->assertResults($productExpectedResult, $actualResults);
     }
 
     /**
@@ -145,6 +256,7 @@ protected function getActualResults(array $filter)
      */
     protected function assertResults($expected, $actual)
     {
+        $this->assertEquals(count($expected), count($actual), 'Number of rewrites does not match');
         foreach ($expected as $row) {
             $this->assertContains(
                 $row,