From 3ec905fcd3b5755374edbfeaa2c7e7c9edef0a0f Mon Sep 17 00:00:00 2001
From: Pieter Hoste <hoste.pieter@gmail.com>
Date: Sat, 18 Apr 2020 17:44:07 +0200
Subject: [PATCH] Fixes unstable email integration tests, by decoding the raw
 contents which had a maximum line length of 76 to a parseable string without
 a maximum line length, so there is no chance a particular string used in an
 assertion is getting splitted over multiple lines - Part 2.

---
 .../Magento/Newsletter/Model/SubscriberTest.php        | 10 +++++-----
 .../testsuite/Magento/ProductAlert/Model/EmailTest.php |  4 ++--
 .../Magento/ProductAlert/Model/ObserverTest.php        |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Newsletter/Model/SubscriberTest.php b/dev/tests/integration/testsuite/Magento/Newsletter/Model/SubscriberTest.php
index 06c8902f45897..ee79ff9ad0e63 100644
--- a/dev/tests/integration/testsuite/Magento/Newsletter/Model/SubscriberTest.php
+++ b/dev/tests/integration/testsuite/Magento/Newsletter/Model/SubscriberTest.php
@@ -89,7 +89,7 @@ public function testUnsubscribeSubscribe(): void
         $this->assertEquals($subscriber, $subscriber->unsubscribe());
         $this->assertContains(
             'You have been unsubscribed from the newsletter.',
-            $this->transportBuilder->getSentMessage()->getRawMessage()
+            $this->transportBuilder->getSentMessage()->getBody()->getParts()[0]->getRawContent()
         );
         $this->assertEquals(Subscriber::STATUS_UNSUBSCRIBED, $subscriber->getSubscriberStatus());
         // Subscribe and verify
@@ -97,7 +97,7 @@ public function testUnsubscribeSubscribe(): void
         $this->assertEquals(Subscriber::STATUS_SUBSCRIBED, $subscriber->getSubscriberStatus());
         $this->assertContains(
             'You have been successfully subscribed to our newsletter.',
-            $this->transportBuilder->getSentMessage()->getRawMessage()
+            $this->transportBuilder->getSentMessage()->getBody()->getParts()[0]->getRawContent()
         );
     }
 
@@ -116,14 +116,14 @@ public function testUnsubscribeSubscribeByCustomerId(): void
         $this->assertEquals(Subscriber::STATUS_UNSUBSCRIBED, $subscriber->getSubscriberStatus());
         $this->assertContains(
             'You have been unsubscribed from the newsletter.',
-            $this->transportBuilder->getSentMessage()->getRawMessage()
+            $this->transportBuilder->getSentMessage()->getBody()->getParts()[0]->getRawContent()
         );
         // Subscribe and verify
         $this->assertSame($subscriber, $subscriber->subscribeCustomerById(1));
         $this->assertEquals(Subscriber::STATUS_SUBSCRIBED, $subscriber->getSubscriberStatus());
         $this->assertContains(
             'You have been successfully subscribed to our newsletter.',
-            $this->transportBuilder->getSentMessage()->getRawMessage()
+            $this->transportBuilder->getSentMessage()->getBody()->getParts()[0]->getRawContent()
         );
     }
 
@@ -143,7 +143,7 @@ public function testConfirm(): void
         $subscriber->confirm($subscriber->getSubscriberConfirmCode());
         $this->assertContains(
             'You have been successfully subscribed to our newsletter.',
-            $this->transportBuilder->getSentMessage()->getRawMessage()
+            $this->transportBuilder->getSentMessage()->getBody()->getParts()[0]->getRawContent()
         );
     }
 
diff --git a/dev/tests/integration/testsuite/Magento/ProductAlert/Model/EmailTest.php b/dev/tests/integration/testsuite/Magento/ProductAlert/Model/EmailTest.php
index 0b2a4124dcc2e..7e604de42f35c 100644
--- a/dev/tests/integration/testsuite/Magento/ProductAlert/Model/EmailTest.php
+++ b/dev/tests/integration/testsuite/Magento/ProductAlert/Model/EmailTest.php
@@ -101,8 +101,8 @@ public function testSend($isCustomerIdUsed)
         $this->_emailModel->send();
 
         $this->assertContains(
-            'Smith,',
-            $this->transportBuilder->getSentMessage()->getRawMessage()
+            'John Smith,',
+            $this->transportBuilder->getSentMessage()->getBody()->getParts()[0]->getRawContent()
         );
     }
 
diff --git a/dev/tests/integration/testsuite/Magento/ProductAlert/Model/ObserverTest.php b/dev/tests/integration/testsuite/Magento/ProductAlert/Model/ObserverTest.php
index e4721f515a320..edc4e05dbbc80 100644
--- a/dev/tests/integration/testsuite/Magento/ProductAlert/Model/ObserverTest.php
+++ b/dev/tests/integration/testsuite/Magento/ProductAlert/Model/ObserverTest.php
@@ -70,8 +70,8 @@ public function testProcess()
     {
         $this->observer->process();
         $this->assertContains(
-            'ohn Smith,',
-            $this->transportBuilder->getSentMessage()->getRawMessage()
+            'John Smith,',
+            $this->transportBuilder->getSentMessage()->getBody()->getParts()[0]->getRawContent()
         );
     }