ACPT-489

fixing integration tests
fixing MFTF tests

Author: JacobBrownAustin

dev/tests/integration/testsuite/Magento/Catalog/Controller/Category/CategoryUrlRewriteTest.php

@@ -26,7 +26,6 @@
  * Checks category availability on storefront by url rewrite
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @magentoConfigFixture default/catalog/seo/generate_category_product_rewrites 1
  * @magentoDbIsolation enabled
  */
 class CategoryUrlRewriteTest extends AbstractController
@@ -73,6 +72,7 @@ protected function setUp(): void
 
     /**
      * @magentoDataFixture Magento/Catalog/_files/category_tree.php
+     * @magentoConfigFixture default/catalog/seo/generate_category_product_rewrites 1
      * @dataProvider categoryRewriteProvider
      * @param int $categoryId
      * @param string $urlPath
@@ -118,6 +118,7 @@ public function categoryRewriteProvider(): array
      *
      * @magentoDataFixture Magento/Catalog/_files/category.php
      * @magentoDataFixture Magento/Store/_files/store.php
+     * @magentoConfigFixture default/catalog/seo/generate_category_product_rewrites 1
      * @return void
      */
     public function testCategoryUrlOnStoreView(): void

dev/tests/integration/testsuite/Magento/Catalog/Controller/Product/ProductUrlRewriteTest.php

@@ -22,7 +22,6 @@
 /**
  * Checks product availability on storefront by url rewrite
  *
- * @magentoConfigFixture default/catalog/seo/generate_category_product_rewrites 1
  * @magentoDbIsolation enabled
  */
 class ProductUrlRewriteTest extends AbstractController
@@ -64,6 +63,7 @@ protected function setUp(): void
     }
 
     /**
+     * @magentoConfigFixture default/catalog/seo/generate_category_product_rewrites 1
      * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
      * @return void
      */
@@ -77,6 +77,7 @@ public function testProductUrlRewrite(): void
     }
 
     /**
+     * @magentoConfigFixture default/catalog/seo/generate_category_product_rewrites 1
      * @magentoDataFixture Magento/Catalog/_files/category_product.php
      * @return void
      */
@@ -91,6 +92,7 @@ public function testCategoryProductUrlRewrite(): void
     }
 
     /**
+     * @magentoConfigFixture default/catalog/seo/generate_category_product_rewrites 1
      * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
      * @return void
      */
@@ -110,6 +112,7 @@ public function testProductRedirect(): void
     }
 
     /**
+     * @magentoConfigFixture default/catalog/seo/generate_category_product_rewrites 1
      * @magentoDbIsolation disabled
      * @magentoDataFixture Magento/Store/_files/core_fixturestore.php
      * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php

dev/tests/integration/testsuite/Magento/Catalog/Model/Product/UrlTest.php

@@ -146,6 +146,7 @@ public function testGetUrl()
      * Check that rearranging product url rewrites do not influence on whether to use category in product links
      *
      * @magentoConfigFixture current_store catalog/seo/product_use_categories 0
+     * @magentoConfigFixture default/catalog/seo/generate_category_product_rewrites 1
      * @magentoDbIsolation disabled
      */
     public function testGetProductUrlWithRearrangedUrlRewrites()

dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest/ProductOtherTest.php

@@ -230,6 +230,7 @@ public function testProductWithLinks()
     }
 
     /**
+     * @magentoConfigFixture default/catalog/seo/generate_category_product_rewrites 1
      * @magentoDataFixture Magento/Catalog/_files/product_without_options.php
      * @magentoDbIsolation enabled
      * @magentoAppIsolation enabled
@@ -287,6 +288,65 @@ public function testUpdateUrlRewritesOnImport()
         }
     }
 
+    /**
+     * @magentoConfigFixture default/catalog/seo/generate_category_product_rewrites 0
+     * @magentoDataFixture Magento/Catalog/_files/product_without_options.php
+     * @magentoDbIsolation enabled
+     * @magentoAppIsolation enabled
+     */
+    public function testUpdateUrlRewritesOnImportWithoutGenerateCategoryProductRewrites()
+    {
+        $filesystem = $this->objectManager->create(\Magento\Framework\Filesystem::class);
+
+        $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
+
+        $source = $this->objectManager->create(
+            \Magento\ImportExport\Model\Import\Source\Csv::class,
+            [
+                'file' => __DIR__ . '/../_files/products_to_import_with_category.csv',
+                'directory' => $directory
+            ]
+        );
+        $errors = $this->_model->setParameters(
+            [
+                'behavior' => \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND,
+                'entity' => \Magento\Catalog\Model\Product::ENTITY
+            ]
+        )->setSource(
+            $source
+        )->validateData();
+
+        $this->assertTrue($errors->getErrorsCount() == 0);
+
+        $this->_model->importData();
+
+        /** @var \Magento\Catalog\Model\Product $product */
+        $product = $this->objectManager->create(\Magento\Catalog\Model\ProductRepository::class)->get('simple');
+        $listOfProductUrlKeys = [
+            sprintf('%s.html', $product->getUrlKey()),
+            sprintf('men/tops/%s.html', $product->getUrlKey()),
+            sprintf('men/%s.html', $product->getUrlKey())
+        ];
+        $repUrlRewriteCol = $this->objectManager->create(
+            UrlRewriteCollection::class
+        );
+
+        /** @var UrlRewriteCollection $collUrlRewrite */
+        $collUrlRewrite = $repUrlRewriteCol->addFieldToSelect(['request_path'])
+            ->addFieldToFilter('entity_id', ['eq'=> $product->getEntityId()])
+            ->addFieldToFilter('entity_type', ['eq'=> 'product'])
+            ->load();
+        $listOfUrlRewriteIds = $collUrlRewrite->getAllIds();
+        $this->assertCount(1, $collUrlRewrite);
+
+        foreach ($listOfUrlRewriteIds as $key => $id) {
+            $this->assertEquals(
+                $listOfProductUrlKeys[$key],
+                $collUrlRewrite->getItemById($id)->getRequestPath()
+            );
+        }
+    }
+
     /**
      * @magentoAppIsolation enabled
      */

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

@@ -20,7 +20,6 @@
  * Base class for url rewrites tests logic
  *
  * @magentoDbIsolation enabled
- * @magentoConfigFixture default/catalog/seo/generate_category_product_rewrites 1
  */
 abstract class AbstractUrlRewriteTest extends TestCase
 {

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

@@ -31,7 +31,6 @@
  * Class for category url rewrites tests
  *
  * @magentoDbIsolation enabled
- * @magentoConfigFixture default/catalog/seo/generate_category_product_rewrites 1
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class CategoryUrlRewriteTest extends TestCase
@@ -82,6 +81,7 @@ protected function setUp(): void
     }
 
     /**
+     * @magentoConfigFixture default/catalog/seo/generate_category_product_rewrites 1
      * @magentoDataFixture Magento/Catalog/_files/category_with_position.php
      * @dataProvider categoryProvider
      * @param array $data
@@ -147,6 +147,7 @@ public function categoryProvider(): array
     }
 
     /**
+     * @magentoConfigFixture default/catalog/seo/generate_category_product_rewrites 1
      * @magentoDataFixture Magento/Catalog/_files/category_tree.php
      * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
      * @dataProvider productRewriteProvider
@@ -187,6 +188,7 @@ public function productRewriteProvider(): array
     }
 
     /**
+     * @magentoConfigFixture default/catalog/seo/generate_category_product_rewrites 1
      * @magentoDataFixture Magento/CatalogUrlRewrite/_files/categories_with_products.php
      * @magentoAppIsolation enabled
      * @dataProvider existingUrlProvider
@@ -251,6 +253,7 @@ public function existingUrlProvider(): array
     }
 
     /**
+     * @magentoConfigFixture default/catalog/seo/generate_category_product_rewrites 1
      * @magentoDataFixture Magento/Catalog/_files/category_product.php
      * @magentoDataFixture Magento/Catalog/_files/catalog_category_with_slash.php
      * @dataProvider categoryMoveProvider
@@ -310,6 +313,7 @@ public function categoryMoveProvider(): array
     }
 
     /**
+     * @magentoConfigFixture default/catalog/seo/generate_category_product_rewrites 1
      * @magentoDataFixture Magento/Catalog/_files/category.php
      * @magentoAppArea adminhtml
      * @return void
@@ -326,6 +330,7 @@ public function testUrlRewritesAfterCategoryDelete(): void
     }
 
     /**
+     * @magentoConfigFixture default/catalog/seo/generate_category_product_rewrites 1
      * @magentoAppArea adminhtml
      * @magentoDataFixture Magento/CatalogUrlRewrite/_files/categories_with_product_ids.php
      * @return void
@@ -349,6 +354,7 @@ public function testUrlRewritesAfterCategoryWithProductsDelete(): void
     }
 
     /**
+     * @magentoConfigFixture default/catalog/seo/generate_category_product_rewrites 1
      * @magentoDataFixture Magento/Store/_files/second_store.php
      * @magentoDataFixture Magento/Catalog/_files/category.php
      * @return void

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

@@ -28,7 +28,6 @@
  * Class for product url rewrites tests
  *
  * @magentoDbIsolation enabled
- * @magentoConfigFixture default/catalog/seo/generate_category_product_rewrites 1
  */
 class ProductUrlRewriteTest extends AbstractUrlRewriteTest
 {
@@ -61,6 +60,7 @@ protected function setUp(): void
     }
 
     /**
+     * @magentoConfigFixture default/catalog/seo/generate_category_product_rewrites 1
      * @dataProvider productDataProvider
      * @param array $data
      * @return void
@@ -140,6 +140,7 @@ public function productDataProvider(): array
     }
 
     /**
+     * @magentoConfigFixture default/catalog/seo/generate_category_product_rewrites 1
      * @magentoDataFixture Magento/CatalogUrlRewrite/_files/product_simple.php
      * @dataProvider productEditProvider
      * @param array $expectedData
@@ -184,6 +185,7 @@ public function productEditProvider(): array
     }
 
     /**
+     * @magentoConfigFixture default/catalog/seo/generate_category_product_rewrites 1
      * @magentoDataFixture Magento/CatalogUrlRewrite/_files/category_with_products.php
      * @dataProvider existingUrlKeyProvider
      * @param array $data
@@ -242,6 +244,7 @@ public function existingUrlKeyProvider(): array
     }
 
     /**
+     * @magentoConfigFixture default/catalog/seo/generate_category_product_rewrites 1
      * @magentoAppArea adminhtml
      * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
      */
@@ -257,6 +260,7 @@ public function testUrlRewritesAfterProductDelete(): void
     }
 
     /**
+     * @magentoConfigFixture default/catalog/seo/generate_category_product_rewrites 1
      * @magentoDbIsolation disabled
      * @magentoDataFixture Magento/Store/_files/second_store.php
      * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
@@ -282,6 +286,7 @@ public function testProductUrlRewritePerStoreViews(): void
     }
 
     /**
+     * @magentoConfigFixture default/catalog/seo/generate_category_product_rewrites 1
      * Check if redirects are generated correctly while product urls are changed during import process.
      *
      * @magentoDataFixture Magento/Catalog/_files/multiple_products.php

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

@@ -171,6 +171,8 @@ public function testMakeProductVisibleViaMassAction()
     /**
      * Test for multistore properties of the product to be respected in generated UrlRewrites
      * during the mass update for visibility change
+     *
+     * @magentoConfigFixture default/catalog/seo/generate_category_product_rewrites 1
      */
     #[
         AppIsolation(true),

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

@@ -88,6 +88,7 @@ function (UrlRewrite $urlRewrite) {
 
     /**
      * @magentoDataFixture Magento/CatalogUrlRewrite/_files/category_with_products.php
+     * @magentoConfigFixture default/catalog/seo/generate_category_product_rewrites 1
      */
     public function testGenerateProductUrlRewrites2()
     {