From 414b897b8ef5e67d1fe4a9ed9789abfac12e466b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Tylek?= Date: Thu, 19 Mar 2020 14:27:43 +0100 Subject: [PATCH 1/3] Newsletter subscription emails should also use paragraph tags --- .../Magento/Newsletter/view/frontend/email/subscr_success.html | 2 +- .../Magento/Newsletter/view/frontend/email/unsub_success.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Newsletter/view/frontend/email/subscr_success.html b/app/code/Magento/Newsletter/view/frontend/email/subscr_success.html index d56163c10fdf3..996dff0c973e9 100644 --- a/app/code/Magento/Newsletter/view/frontend/email/subscr_success.html +++ b/app/code/Magento/Newsletter/view/frontend/email/subscr_success.html @@ -13,6 +13,6 @@ {{template config_path="design/email/header_template"}} -{{trans "You have been successfully subscribed to our newsletter."}} +

{{trans "You have been successfully subscribed to our newsletter."}}

{{template config_path="design/email/footer_template"}} diff --git a/app/code/Magento/Newsletter/view/frontend/email/unsub_success.html b/app/code/Magento/Newsletter/view/frontend/email/unsub_success.html index d39b5d8a8b8e9..1f222f85abac7 100644 --- a/app/code/Magento/Newsletter/view/frontend/email/unsub_success.html +++ b/app/code/Magento/Newsletter/view/frontend/email/unsub_success.html @@ -13,6 +13,6 @@ {{template config_path="design/email/header_template"}} -{{trans "You have been unsubscribed from the newsletter."}} +

{{trans "You have been unsubscribed from the newsletter."}}

{{template config_path="design/email/footer_template"}} From 2f0bbe93b187c050a5049be66cb0fcdf97827193 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Tylek?= Date: Fri, 27 Mar 2020 17:45:36 +0100 Subject: [PATCH 2/3] Fix integration tests --- .../Magento/Newsletter/Model/SubscriberTest.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 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..d2248737679c0 100644 --- a/dev/tests/integration/testsuite/Magento/Newsletter/Model/SubscriberTest.php +++ b/dev/tests/integration/testsuite/Magento/Newsletter/Model/SubscriberTest.php @@ -88,7 +88,7 @@ public function testUnsubscribeSubscribe(): void $this->assertSame($subscriber, $subscriber->loadByCustomerId(1)); $this->assertEquals($subscriber, $subscriber->unsubscribe()); $this->assertContains( - 'You have been unsubscribed from the newsletter.', + '

You have been unsubscribed from the newsletter.

', $this->transportBuilder->getSentMessage()->getRawMessage() ); $this->assertEquals(Subscriber::STATUS_UNSUBSCRIBED, $subscriber->getSubscriberStatus()); @@ -96,7 +96,7 @@ public function testUnsubscribeSubscribe(): void $this->assertEquals(Subscriber::STATUS_SUBSCRIBED, $subscriber->subscribe('customer@example.com')); $this->assertEquals(Subscriber::STATUS_SUBSCRIBED, $subscriber->getSubscriberStatus()); $this->assertContains( - 'You have been successfully subscribed to our newsletter.', + '

You have been successfully subscribed to our newsletter.

', $this->transportBuilder->getSentMessage()->getRawMessage() ); } @@ -115,14 +115,14 @@ public function testUnsubscribeSubscribeByCustomerId(): void $this->assertSame($subscriber, $subscriber->unsubscribeCustomerById(1)); $this->assertEquals(Subscriber::STATUS_UNSUBSCRIBED, $subscriber->getSubscriberStatus()); $this->assertContains( - 'You have been unsubscribed from the newsletter.', + '

You have been unsubscribed from the newsletter.

', $this->transportBuilder->getSentMessage()->getRawMessage() ); // 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.', + '

You have been successfully subscribed to our newsletter.

', $this->transportBuilder->getSentMessage()->getRawMessage() ); } @@ -142,7 +142,7 @@ public function testConfirm(): void $subscriber->loadByEmail($customerEmail); $subscriber->confirm($subscriber->getSubscriberConfirmCode()); $this->assertContains( - 'You have been successfully subscribed to our newsletter.', + '

You have been successfully subscribed to our newsletter.

', $this->transportBuilder->getSentMessage()->getRawMessage() ); } From a216e7fc93ee015a0128aadebbd1c7ee722a5299 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Tylek?= Date: Sat, 4 Apr 2020 19:08:12 +0200 Subject: [PATCH 3/3] Revert changes to test --- .../Magento/Newsletter/Model/SubscriberTest.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dev/tests/integration/testsuite/Magento/Newsletter/Model/SubscriberTest.php b/dev/tests/integration/testsuite/Magento/Newsletter/Model/SubscriberTest.php index d2248737679c0..06c8902f45897 100644 --- a/dev/tests/integration/testsuite/Magento/Newsletter/Model/SubscriberTest.php +++ b/dev/tests/integration/testsuite/Magento/Newsletter/Model/SubscriberTest.php @@ -88,7 +88,7 @@ public function testUnsubscribeSubscribe(): void $this->assertSame($subscriber, $subscriber->loadByCustomerId(1)); $this->assertEquals($subscriber, $subscriber->unsubscribe()); $this->assertContains( - '

You have been unsubscribed from the newsletter.

', + 'You have been unsubscribed from the newsletter.', $this->transportBuilder->getSentMessage()->getRawMessage() ); $this->assertEquals(Subscriber::STATUS_UNSUBSCRIBED, $subscriber->getSubscriberStatus()); @@ -96,7 +96,7 @@ public function testUnsubscribeSubscribe(): void $this->assertEquals(Subscriber::STATUS_SUBSCRIBED, $subscriber->subscribe('customer@example.com')); $this->assertEquals(Subscriber::STATUS_SUBSCRIBED, $subscriber->getSubscriberStatus()); $this->assertContains( - '

You have been successfully subscribed to our newsletter.

', + 'You have been successfully subscribed to our newsletter.', $this->transportBuilder->getSentMessage()->getRawMessage() ); } @@ -115,14 +115,14 @@ public function testUnsubscribeSubscribeByCustomerId(): void $this->assertSame($subscriber, $subscriber->unsubscribeCustomerById(1)); $this->assertEquals(Subscriber::STATUS_UNSUBSCRIBED, $subscriber->getSubscriberStatus()); $this->assertContains( - '

You have been unsubscribed from the newsletter.

', + 'You have been unsubscribed from the newsletter.', $this->transportBuilder->getSentMessage()->getRawMessage() ); // 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.

', + 'You have been successfully subscribed to our newsletter.', $this->transportBuilder->getSentMessage()->getRawMessage() ); } @@ -142,7 +142,7 @@ public function testConfirm(): void $subscriber->loadByEmail($customerEmail); $subscriber->confirm($subscriber->getSubscriberConfirmCode()); $this->assertContains( - '

You have been successfully subscribed to our newsletter.

', + 'You have been successfully subscribed to our newsletter.', $this->transportBuilder->getSentMessage()->getRawMessage() ); }