Merge pull request #6164 from magento-tsg/MC-37802

[Arrows] MC-37802: Broken Integration tests in Magento 2.4.1-beta1

Author: zakdma

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

@@ -50,5 +50,5 @@
     ->setCanSaveCustomOptions(true)
     ->setHasOptions(true);
 /** @var ProductRepositoryInterface $productRepositoryFactory */
-$productRepository = $objectManager->create(ProductRepositoryInterface::class);
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
 $productRepository->save($product);

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

@@ -20,7 +20,7 @@
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', true);
 /** @var ProductRepositoryInterface $productRepository */
-$productRepository = $objectManager->create(ProductRepositoryInterface::class);
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
 
 try {
     $productRepository->deleteById('out-of-stock-product');

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

@@ -4,19 +4,36 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $product \Magento\Catalog\Model\Product */
-$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
-$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
-    ->setAttributeSetId(4)
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Type;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Catalog\Model\ProductFactory;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var ObjectManagerInterface $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+/** @var ProductFactory $productFactory */
+$productFactory = $objectManager->get(ProductFactory::class);
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+
+/** @var Product $product */
+$product = $productFactory->create();
+$product->setTypeId(Type::TYPE_SIMPLE)
+    ->setAttributeSetId($product->getDefaultAttributeSetId())
     ->setName('New Product')
     ->setSku('simple')
     ->setPrice(10)
-    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
-    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+    ->setVisibility(Visibility::VISIBILITY_BOTH)
+    ->setStatus(Status::STATUS_ENABLED)
     ->setWebsiteIds([1])
     ->setStockData(['qty' => 100, 'is_in_stock' => 1, 'manage_stock' => 1])
     ->setNewsFromDate(date('Y-m-d H:i:s', strtotime('-2 day')))
     ->setNewsToDate(date('Y-m-d H:i:s', strtotime('+2 day')))
     ->setDescription('description')
-    ->setShortDescription('short desc')
-    ->save();
+    ->setShortDescription('short desc');
+
+$productRepository->save($product);

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

@@ -4,21 +4,26 @@
  * See COPYING.txt for license details.
  */
 
-$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
 
-/** @var \Magento\Framework\Registry $registry */
-$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+/** @var ObjectManagerInterface $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+/** @var Registry $registry */
+$registry = $objectManager->get(Registry::class);
 
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', true);
 
-/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
-$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
 
 try {
-    $firstProduct = $productRepository->get('simple', false, null, true);
-    $productRepository->delete($firstProduct);
-} catch (\Magento\Framework\Exception\NoSuchEntityException $exception) {
+    $productRepository->deleteById('simple');
+} catch (NoSuchEntityException $exception) {
     //Product already removed
 }
 

dev/tests/integration/testsuite/Magento/Reports/_files/recently_compared_out_of_stock_product_rollback.php

@@ -7,5 +7,5 @@
 
 use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
-Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/out_of_stock_product_with_category.php');
+Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/out_of_stock_product_with_category_rollback.php');
 Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer_rollback.php');