Skip to content

Commit 0b9013e

Browse files
committed
update testConfirmationEmailWithSpecialCharacters - add transformation check similar to Zend\Mail\Header\AbstractAddressList
1 parent 95878b7 commit 0b9013e

File tree

1 file changed

+13
-1
lines changed

1 file changed

+13
-1
lines changed

dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -769,7 +769,19 @@ public function testConfirmationEmailWithSpecialCharacters(): void
769769
$message = $this->transportBuilderMock->getSentMessage();
770770
$rawMessage = $message->getRawMessage();
771771

772-
$this->assertContains('To: John Smith <' . $email . '>', $rawMessage);
772+
/** @var \Zend\Mime\Part $messageBodyPart */
773+
$messageBodyParts = $message->getBody()->getParts();
774+
$messageBodyPart = reset($messageBodyParts);
775+
$messageEncoding = $messageBodyPart->getCharset();
776+
$name = 'John Smith';
777+
778+
if (strtoupper($messageEncoding) !== 'ASCII') {
779+
$name = \Zend\Mail\Header\HeaderWrap::mimeEncodeValue($name, $messageEncoding);
780+
}
781+
782+
$nameEmail = sprintf('%s <%s>', $name, $email);
783+
784+
$this->assertContains('To: ' . $nameEmail, $rawMessage);
773785

774786
$content = $message->getBody()->getParts()[0]->getRawContent();
775787
$confirmationUrl = $this->getConfirmationUrlFromMessageContent($content);

0 commit comments

Comments
 (0)