Github #99: Sync "develop-storefront" with master branches

dev/tests/integration/testsuite/Magento/Catalog/_files/configurable_products_with_custom_attribute_layered_navigation.php

@@ -31,9 +31,3 @@
 $attributeRepository->save($attribute);
 
 CacheCleaner::cleanAll();
-
-// Run from CLI due to some classes involved in reindex process have state which do not allow to reindex
-$appDir = dirname(Bootstrap::getInstance()->getAppTempDir());
-$out = '';
-// phpcs:ignore Magento2.Security.InsecureFunction
-exec("php -f {$appDir}/bin/magento indexer:reindex catalogsearch_fulltext", $out);

dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple.php

@@ -207,16 +207,3 @@
     $product->getSku(),
     [2]
 );
-
-/**
- * We need to remember that automatic reindexation is not working properly in integration tests
- * Reindexation is sitting on top of afterCommit callbacks:
- * \Magento\Catalog\Model\Product::priceReindexCallback
- *
- * However, callbacks are applied only when transaction_level = 0 (when transaction is commited), however
- * integration tests are not committing transactions, so we need to reindex data manually in order to reuse it in tests
- */
-/** @var \Magento\Indexer\Model\Indexer $indexer */
-$indexer = $objectManager->create(\Magento\Indexer\Model\Indexer::class);
-$indexer->load('catalog_product_price');
-$indexer->reindexRow($product->getId());

dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_disabled.php

@@ -207,16 +207,3 @@
     $product->getSku(),
     [2]
 );
-
-/**
- * We need to remember that automatic reindexation is not working properly in integration tests
- * Reindexation is sitting on top of afterCommit callbacks:
- * \Magento\Catalog\Model\Product::priceReindexCallback
- *
- * However, callbacks are applied only when transaction_level = 0 (when transaction is commited), however
- * integration tests are not committing transactions, so we need to reindex data manually in order to reuse it in tests
- */
-/** @var \Magento\Indexer\Model\Indexer $indexer */
-$indexer = $objectManager->create(\Magento\Indexer\Model\Indexer::class);
-$indexer->load('catalog_product_price');
-$indexer->reindexRow($product->getId());

dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_layered_navigation_custom_attribute.php

@@ -149,9 +149,3 @@
     }
 }
 CacheCleaner::cleanAll();
-
-// Run from CLI due to some classes involved in reindex process have state which do not allow to reindex
-$appDir = dirname(Bootstrap::getInstance()->getAppTempDir());
-$out = '';
-// phpcs:ignore Magento2.Security.InsecureFunction
-exec("php -f {$appDir}/bin/magento indexer:reindex catalogsearch_fulltext", $out);

dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_layered_navigation_with_multiselect_attribute.php

@@ -92,9 +92,3 @@
 $productRepository->save($product);
 
 CacheCleaner::cleanAll();
-
-// Run from CLI due to some classes involved in reindex process have state which do not allow to reindex
-$appDir = dirname(Bootstrap::getInstance()->getAppTempDir());
-$out = '';
-// phpcs:ignore Magento2.Security.InsecureFunction
-exec("php -f {$appDir}/bin/magento indexer:reindex catalogsearch_fulltext", $out);

dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable.php

@@ -143,17 +143,3 @@
     $product->getSku(),
     [2]
 );
-
-/**
- * We need to remember that automatic reindexation is not working properly in integration tests
- * Reindexation is sitting on top of afterCommit callbacks:
- * \Magento\Catalog\Model\Product::priceReindexCallback
- *
- * However, callbacks are applied only when transaction_level = 0 (when transaction is commited), however
- * integration tests are not committing transactions, so we need to reindex data manually in order to reuse it in tests
- */
-/** @var \Magento\Indexer\Model\Indexer $indexer */
-$indexer = Bootstrap::getObjectManager()->create(\Magento\Indexer\Model\Indexer::class);
-$indexer->load('catalog_product_price');
-$indexer->reindexRow($product->getId());
-$indexer->reindexList($idsToReindex);

dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_sku.php

@@ -36,7 +36,6 @@
 $attributeValues = [];
 $attributeSetId = $installer->getAttributeSetId('catalog_product', 'Default');
 $associatedProductIds = [];
-$idsToReindex = $productIds = [10, 20];
 array_shift($options); //remove the first option which is empty
 
 foreach ($options as $option) {
@@ -142,16 +141,3 @@
     $product->getSku(),
     [2]
 );
-
-/**
- * We need to remember that automatic reindexation is not working properly in integration tests
- * Reindexation is sitting on top of afterCommit callbacks:
- * \Magento\Catalog\Model\Product::priceReindexCallback
- *
- * However, callbacks are applied only when transaction_level = 0 (when transaction is commited), however
- * integration tests are not committing transactions, so we need to reindex data manually in order to reuse it in tests
- */
-/** @var \Magento\Indexer\Model\Indexer $indexer */
-$indexer = Bootstrap::getObjectManager()->create(\Magento\Indexer\Model\Indexer::class);
-$indexer->load('catalog_product_price');
-$indexer->reindexList($idsToReindex);

dev/tests/integration/testsuite/Magento/Wishlist/_files/two_wishlists_for_two_diff_customers.php

@@ -31,16 +31,3 @@
 $wishlistForSecondCustomer->loadByCustomerId($secondCustomerIdFromFixture, true);
 $item = $wishlistForSecondCustomer->addNewItem($product, new \Magento\Framework\DataObject([]));
 $wishlistForSecondCustomer->save();
-
-/**
- * We need to remember that automatic reindexation is not working properly in integration tests
- * Reindexation is sitting on top of afterCommit callbacks:
- * \Magento\Catalog\Model\Product::priceReindexCallback
- *
- * However, callbacks are applied only when transaction_level = 0 (when transaction is commited), however
- * integration tests are not committing transactions, so we need to reindex data manually in order to reuse it in tests
- */
-/** @var \Magento\Indexer\Model\Indexer $indexer */
-$indexer = Bootstrap::getObjectManager()->create(\Magento\Indexer\Model\Indexer::class);
-$indexer->load('catalog_product_price');
-$indexer->reindexList([$product->getId()]);

dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist.php

@@ -25,16 +25,3 @@
 $wishlist->loadByCustomerId($customer->getId(), true);
 $item = $wishlist->addNewItem($product, new DataObject([]));
 $wishlist->setSharingCode('fixture_unique_code')->save();
-
-/**
- * We need to remember that automatic reindexation is not working properly in integration tests
- * Reindexation is sitting on top of afterCommit callbacks:
- * \Magento\Catalog\Model\Product::priceReindexCallback
- *
- * However, callbacks are applied only when transaction_level = 0 (when transaction is commited), however
- * integration tests are not committing transactions, so we need to reindex data manually in order to reuse it in tests
- */
-/** @var \Magento\Indexer\Model\Indexer $indexer */
-$indexer = Bootstrap::getObjectManager()->create(\Magento\Indexer\Model\Indexer::class);
-$indexer->load('catalog_product_price');
-$indexer->reindexList([$product->getId()]);

dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_disabled_simple_product.php

@@ -16,17 +16,3 @@
 $product = $productRepository->get($productSku);
 $product->setStatus(ProductStatus::STATUS_DISABLED);
 $productRepository->save($product);
-
-/**
- * We need to remember that automatic reindexation is not working properly in integration tests
- * Reindexation is sitting on top of afterCommit callbacks:
- * \Magento\Catalog\Model\Product::priceReindexCallback
- *
- * However, callbacks are applied only when transaction_level = 0 (when transaction is commited), however
- * integration tests are not committing transactions, so we need to reindex data manually in order to reuse it in tests
- */
-/** @var \Magento\Indexer\Model\Indexer $indexer */
-$indexer = \Magento\TestFramework\Helper\Bootstrap
-    ::getObjectManager()->create(\Magento\Indexer\Model\Indexer::class);
-$indexer->load('catalog_product_price');
-$indexer->reindexList([$product->getId()]);