Skip to content

Commit e212405

Browse files
ENGCOM-7467: Fixes unstable email integration tests #27892
- Merge Pull Request #27892 from hostep/magento2:fix-unstable-email-tests-part2 - Merged commits: 1. 3ec905f
2 parents d4a9098 + 3ec905f commit e212405

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

dev/tests/integration/testsuite/Magento/Newsletter/Model/SubscriberTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,15 +89,15 @@ public function testUnsubscribeSubscribe(): void
8989
$this->assertEquals($subscriber, $subscriber->unsubscribe());
9090
$this->assertContains(
9191
'You have been unsubscribed from the newsletter.',
92-
$this->transportBuilder->getSentMessage()->getRawMessage()
92+
$this->transportBuilder->getSentMessage()->getBody()->getParts()[0]->getRawContent()
9393
);
9494
$this->assertEquals(Subscriber::STATUS_UNSUBSCRIBED, $subscriber->getSubscriberStatus());
9595
// Subscribe and verify
9696
$this->assertEquals(Subscriber::STATUS_SUBSCRIBED, $subscriber->subscribe('customer@example.com'));
9797
$this->assertEquals(Subscriber::STATUS_SUBSCRIBED, $subscriber->getSubscriberStatus());
9898
$this->assertContains(
9999
'You have been successfully subscribed to our newsletter.',
100-
$this->transportBuilder->getSentMessage()->getRawMessage()
100+
$this->transportBuilder->getSentMessage()->getBody()->getParts()[0]->getRawContent()
101101
);
102102
}
103103

@@ -116,14 +116,14 @@ public function testUnsubscribeSubscribeByCustomerId(): void
116116
$this->assertEquals(Subscriber::STATUS_UNSUBSCRIBED, $subscriber->getSubscriberStatus());
117117
$this->assertContains(
118118
'You have been unsubscribed from the newsletter.',
119-
$this->transportBuilder->getSentMessage()->getRawMessage()
119+
$this->transportBuilder->getSentMessage()->getBody()->getParts()[0]->getRawContent()
120120
);
121121
// Subscribe and verify
122122
$this->assertSame($subscriber, $subscriber->subscribeCustomerById(1));
123123
$this->assertEquals(Subscriber::STATUS_SUBSCRIBED, $subscriber->getSubscriberStatus());
124124
$this->assertContains(
125125
'You have been successfully subscribed to our newsletter.',
126-
$this->transportBuilder->getSentMessage()->getRawMessage()
126+
$this->transportBuilder->getSentMessage()->getBody()->getParts()[0]->getRawContent()
127127
);
128128
}
129129

@@ -143,7 +143,7 @@ public function testConfirm(): void
143143
$subscriber->confirm($subscriber->getSubscriberConfirmCode());
144144
$this->assertContains(
145145
'You have been successfully subscribed to our newsletter.',
146-
$this->transportBuilder->getSentMessage()->getRawMessage()
146+
$this->transportBuilder->getSentMessage()->getBody()->getParts()[0]->getRawContent()
147147
);
148148
}
149149

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ public function testSend($isCustomerIdUsed)
101101
$this->_emailModel->send();
102102

103103
$this->assertContains(
104-
'Smith,',
105-
$this->transportBuilder->getSentMessage()->getRawMessage()
104+
'John Smith,',
105+
$this->transportBuilder->getSentMessage()->getBody()->getParts()[0]->getRawContent()
106106
);
107107
}
108108

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ public function testProcess()
7070
{
7171
$this->observer->process();
7272
$this->assertContains(
73-
'ohn Smith,',
74-
$this->transportBuilder->getSentMessage()->getRawMessage()
73+
'John Smith,',
74+
$this->transportBuilder->getSentMessage()->getBody()->getParts()[0]->getRawContent()
7575
);
7676
}
7777

0 commit comments

Comments
 (0)