Skip to content

Commit 5d6c3fa

Browse files
authored
ENGCOM-5437: [2.2][Backport] Transfer Encoding of emails changed to QUOTED-PRINTABLE #23650
2 parents 5a17bf3 + c736a95 commit 5d6c3fa

File tree

14 files changed

+21
-14
lines changed

14 files changed

+21
-14
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -685,7 +685,7 @@ public function testConfirmationEmailWithSpecialCharacters()
685685

686686
$this->assertContains('To: ' . $email, $rawMessage);
687687

688-
$content = $message->getBody()->getPartContent(0);
688+
$content = $message->getBody()->getParts()[0]->getRawContent();
689689
$confirmationUrl = $this->getConfirmationUrlFromMessageContent($content);
690690
$this->setRequestInfo($confirmationUrl, 'confirm');
691691
$this->clearCookieMessagesList();

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66

77
namespace Magento\Newsletter\Model;
88

9+
/**
10+
* \Magento\Newsletter\Model\Subscriber tests
11+
*/
912
class SubscriberTest extends \PHPUnit\Framework\TestCase
1013
{
1114
/**
@@ -39,7 +42,7 @@ public function testEmailConfirmation()
3942
$this->assertContains(
4043
'/newsletter/subscriber/confirm/id/' . $this->_model->getSubscriberId()
4144
. '/code/ysayquyajua23iq29gxwu2eax2qb6gvy',
42-
$transportBuilder->getSentMessage()->getRawMessage()
45+
$transportBuilder->getSentMessage()->getBody()->getParts()[0]->getRawContent()
4346
);
4447
$this->assertEquals(Subscriber::STATUS_NOT_ACTIVE, $this->_model->getSubscriberStatus());
4548
}

dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Create/SaveTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ public function testSendEmailOnOrderSave()
141141
);
142142

143143
$this->assertEquals($message->getSubject(), $subject);
144-
$this->assertThat($message->getRawMessage(), $assert);
144+
$this->assertThat($message->getBody()->getParts()[0]->getRawContent(), $assert);
145145
}
146146

147147
/**

dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/AddCommentTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public function testSendEmailOnAddCreditmemoComment()
5454
);
5555

5656
$this->assertEquals($message->getSubject(), $subject);
57-
$this->assertThat($message->getRawMessage(), $messageConstraint);
57+
$this->assertThat($message->getBody()->getParts()[0]->getRawContent(), $messageConstraint);
5858
}
5959

6060
/**

dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/SaveTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public function testSendEmailOnCreditmemoSave()
5151
);
5252

5353
$this->assertEquals($message->getSubject(), $subject);
54-
$this->assertThat($message->getRawMessage(), $messageConstraint);
54+
$this->assertThat($message->getBody()->getParts()[0]->getRawContent(), $messageConstraint);
5555
}
5656

5757
/**

dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/EmailTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public function testSendOrderEmail()
8282
);
8383

8484
$this->assertEquals($message->getSubject(), $subject);
85-
$this->assertThat($message->getRawMessage(), $assert);
85+
$this->assertThat($message->getBody()->getParts()[0]->getRawContent(), $assert);
8686
}
8787

8888
/**

dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/AddCommentTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public function testSendEmailOnAddInvoiceComment()
5555
);
5656

5757
$this->assertEquals($message->getSubject(), $subject);
58-
$this->assertThat($message->getRawMessage(), $messageConstraint);
58+
$this->assertThat($message->getBody()->getParts()[0]->getRawContent(), $messageConstraint);
5959
}
6060

6161
/**

dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/EmailTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public function testSendInvoiceEmail()
5959
);
6060

6161
$this->assertEquals($message->getSubject(), $subject);
62-
$this->assertThat($message->getRawMessage(), $messageConstraint);
62+
$this->assertThat($message->getBody()->getParts()[0]->getRawContent(), $messageConstraint);
6363
}
6464

6565
/**

dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/SaveTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public function testSendEmailOnInvoiceSave()
5151
);
5252

5353
$this->assertEquals($message->getSubject(), $subject);
54-
$this->assertThat($message->getRawMessage(), $messageConstraint);
54+
$this->assertThat($message->getBody()->getParts()[0]->getRawContent(), $messageConstraint);
5555
}
5656

5757
/**

dev/tests/integration/testsuite/Magento/Sales/Model/Order/CreateTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,6 @@ public function testSendEmailOnOrderPlace()
9595
);
9696

9797
$this->assertEquals($message->getSubject(), $subject);
98-
$this->assertThat($message->getRawMessage(), $assert);
98+
$this->assertThat($message->getBody()->getParts()[0]->getRawContent(), $assert);
9999
}
100100
}

0 commit comments

Comments
 (0)