MC-21646: Integration Test failed with elasticsearch6: Magento\ProductAlert\Model\ObserverTest::testProcessPortuguese

Author: MorozovaNP

dev/tests/integration/testsuite/Magento/Customer/_files/customer_for_second_store.php

@@ -7,11 +7,14 @@
 
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Store\Api\StoreRepositoryInterface;
 
 require __DIR__ . '/customer.php';
 
 $objectManager = Bootstrap::getObjectManager();
+$storeRepository = $objectManager->get(StoreRepositoryInterface::class);
+$storeId = $storeRepository->get('fixture_second_store')->getId();
 $repository = $objectManager->create(CustomerRepositoryInterface::class);
 $customer = $repository->get('customer@example.com');
-$customer->setStoreId(2);
+$customer->setStoreId($storeId);
 $repository->save($customer);

dev/tests/integration/testsuite/Magento/ProductAlert/Model/ObserverTest.php

@@ -116,9 +116,10 @@ public function testProcessPortuguese()
 
         // dispatch process() method and check sent message
         $this->observer->process();
-        $message = $this->transportBuilder->getSentMessage()->getRawMessage();
+        $message = $this->transportBuilder->getSentMessage();
+        $messageContent = $message->getBody()->getParts()[0]->getRawContent();
         $expectedText = array_shift($translation);
-        $this->assertContains('/frontend/Magento/luma/pt_BR/', $message);
-        $this->assertContains(substr($expectedText, 0, 50), $message);
+        $this->assertContains('/frontend/Magento/luma/pt_BR/', $messageContent);
+        $this->assertContains(substr($expectedText, 0, 50), $messageContent);
     }
 }

dev/tests/integration/testsuite/Magento/ProductAlert/_files/product_alert_with_store.php

@@ -8,22 +8,26 @@
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\ProductAlert\Model\Price;
 use Magento\ProductAlert\Model\Stock;
+use Magento\Store\Api\StoreRepositoryInterface;
 
 require __DIR__ . '/../../../Magento/Customer/_files/customer_for_second_store.php';
 require __DIR__ . '/../../../Magento/Catalog/_files/product_simple_out_of_stock_without_categories.php';
 
 $objectManager = Bootstrap::getObjectManager();
+$storeRepository = $objectManager->get(StoreRepositoryInterface::class);
+$storeId = $storeRepository->get('fixture_second_store')->getId();
+
 $price = $objectManager->create(Price::class);
 $price->setCustomerId($customer->getId())
     ->setProductId($product->getId())
     ->setPrice($product->getPrice()+1)
     ->setWebsiteId(1)
-    ->setStoreId(2);
+    ->setStoreId($storeId);
 $price->save();
 
 $stock = $objectManager->create(Stock::class);
 $stock->setCustomerId($customer->getId())
     ->setProductId($product->getId())
     ->setWebsiteId(1)
-    ->setStoreId(2);
+    ->setStoreId($storeId);
 $stock->save();