Skip to content

Fixes unstable email integration tests #27892

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 25, 2020
Merged

Fixes unstable email integration tests #27892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions dev/tests/integration/testsuite/Magento/Newsletter/Model/SubscriberTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,15 +89,15 @@ 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
$this->assertEquals(Subscriber::STATUS_SUBSCRIBED, $subscriber->subscribe('[email protected]'));
$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()
);
}

Expand All @@ -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()
);
}

Expand All @@ -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()
);
}

Expand Down
4 changes: 2 additions & 2 deletions dev/tests/integration/testsuite/Magento/ProductAlert/Model/EmailTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
);
}

Expand Down
4 changes: 2 additions & 2 deletions dev/tests/integration/testsuite/Magento/ProductAlert/Model/ObserverTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
);
}

Expand Down