Merge remote-tracking branch 'origin/MC-29945-cart-image' into MC-21228

Author: Prabhu Ram

dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/AddSimpleProductToCartTest.php

@@ -126,7 +126,7 @@ public function testAddProductToCartWithImage()
         $this->assertEquals('11', $cartItem['prices']['price']['value']);
         $this->assertEquals($sku, $cartItem['product']['sku']);
         $expectedImageRegex = '/^https?:\/\/.+magento_image(_[0-9]+)?.jpg$/';
-        $this->assertRegExp($expectedImageRegex, $cartItem['product']['image']['url']);
+        $this->assertMatchesRegularExpression($expectedImageRegex, $cartItem['product']['image']['url']);
     }
 
     /**

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

@@ -3,9 +3,10 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
-require __DIR__ . '/product_image.php';
-require __DIR__ . '/product_simple_without_custom_options.php';
+Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/product_image.php');
+Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/product_simple_without_custom_options.php');
 
 $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 $productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);

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

@@ -3,6 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
-require __DIR__ . '/product_image_rollback.php';
-require __DIR__ . '/product_simple_without_custom_options_rollback.php';
+Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/product_image_rollback.php');
+Resolver::getInstance()->requireDataFixture(
+    'Magento/Catalog/_files/product_simple_without_custom_options_rollback.php'
+);