Cavemanon/piratepoet
8
Fork 0
Code Pull Requests Actions Releases 16 Activity

Merge pull request #945 from mailpoet/newsletter_preview_email_update

Browse Source 
Adds bogus list-unsubscribe link & disables view in browser link in preview emails [MAILPOET-948] [MAILPOET-875]
This commit is contained in:
Tautvidas Sipavičius
2017-06-20 12:22:25 +03:00
committed by GitHub
parent 812c6634ba 43c2908a2b
commit 1d6cdfe2cc
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/API/JSON/v1/Newsletters.php
View File

@@ -279,7 +279,9 @@ class Newsletters extends APIEndpoint {
$shortcodes = new \MailPoet\Newsletter\Shortcodes\Shortcodes(
$newsletter,
$subscriber
$subscriber,
$queue = false,
$wp_user_preview = true
);
list(
@@ -296,7 +298,8 @@ class Newsletters extends APIEndpoint {
$sender = false,
$reply_to = false
);
$result = $mailer->send($rendered_newsletter, $data['subscriber']);
$extra_params = array('unsubscribe_url' => home_url());
$result = $mailer->send($rendered_newsletter, $data['subscriber'], $extra_params);
if($result['response'] === false) {
$error = sprintf(

7
tests/unit/API/JSON/v1/NewslettersTest.php
View File

@@ -585,10 +585,15 @@ class NewslettersTest extends MailPoetTest {
'mailer' => Stub::makeEmpty(
'\MailPoet\Mailer\Mailer',
array(
'send' => function($newsletter, $subscriber) {
'send' => function($newsletter, $subscriber, $extra_params) {
expect(is_array($newsletter))->true();
expect($newsletter['body']['text'])->contains('Hello test');
expect($subscriber)->equals($subscriber);
expect($extra_params['unsubscribe_url'])->equals(home_url());
// system links are replaced with hashes
expect($newsletter['body']['html'])->contains('href="#">View in browser');
expect($newsletter['body']['html'])->contains('href="#">Unsubscribe');
expect($newsletter['body']['html'])->contains('href="#">Manage subscription');
return array('response' => true);
}
)

4
tests/unit/_bootstrap.php
View File

@@ -1,6 +1,8 @@
<?php
use Codeception\Util\Fixtures;
$newsletter_body_text =
Fixtures::add(
'newsletter_body_template',
'{
@@ -20,7 +22,7 @@ Fixtures::add(
"blocks": [
{
"type": "text",
"text": "<a data-post-id=\"10\" href=\"http://example.com\">Link</a>Hello [subscriber:firstname | default:test]"
"text": "<a href=\"[link:newsletter_view_in_browser_url]\">View in browser link</a> <a data-post-id=\"10\" href=\"http://example.com\">Post link</a> Hello [subscriber:firstname | default:test] <a href=\"[link:subscription_unsubscribe_url]\">Unsubscribe link</a> <a href=\"[link:subscription_manage_url]\">Manage subscription link</a>"
}
]
}