Merge pull request #945 from mailpoet/newsletter_preview_email_update
Adds bogus list-unsubscribe link & disables view in browser link in preview emails [MAILPOET-948] [MAILPOET-875]
This commit is contained in:
@@ -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(
|
||||
|
@@ -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);
|
||||
}
|
||||
)
|
||||
|
@@ -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>"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
Reference in New Issue
Block a user