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

Replace shortcodes with human readable text

Browse Source 
[MAILPOET-2085]
This commit is contained in:
Pavel Dohnal
2019-06-25 13:18:06 +02:00
committed by M. Shull
parent e6608a5cd7
commit 6ff194e8e5
2 changed files with 78 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/Cron/Workers/StatsNotifications/Worker.php
View File

@ -139,7 +139,8 @@ class Worker {
]; ];
if ($link) { if ($link) {
$context['topLinkClicks'] = (int)$link->clicksCount; $context['topLinkClicks'] = (int)$link->clicksCount;
$context['topLink'] = $link->url; $mappings = self::getShortcodeLinksMapping();
$context['topLink'] = isset($mappings[$link->url]) ? $mappings[$link->url] : $link->url;
} }
return $context; return $context;
} }
@ -151,4 +152,12 @@ class Worker {
$task->save(); $task->save();
} }
public static function getShortcodeLinksMapping() {
return [
'[link:subscription_unsubscribe_url]' => __('Unsubscribe link', 'mailpoet'),
'[link:subscription_manage_url]' => __('Manage subscription link', 'mailpoet'),
'[link:newsletter_view_in_browser_url]' => __('View in browser link', 'mailpoet'),
];
}
} }

88
tests/integration/Cron/Workers/StatsNotifications/WorkerTest.php
View File

@ -31,6 +31,12 @@ class WorkerTest extends \MailPoetTest {
/** @var SettingsController */ /** @var SettingsController */
private $settings; private $settings;
/** @var Newsletter */
private $newsletter;
/** @var SendingQueue */
private $queue;
function _before() { function _before() {
parent::_before(); parent::_before();
\ORM::raw_execute('TRUNCATE ' . Newsletter::$_table); \ORM::raw_execute('TRUNCATE ' . Newsletter::$_table);
@ -45,7 +51,7 @@ class WorkerTest extends \MailPoetTest {
'enabled' => true, 'enabled' => true,
'address' => 'email@example.com', 'address' => 'email@example.com',
]); ]);
$newsletter = Newsletter::createOrUpdate([ $this->newsletter = Newsletter::createOrUpdate([
'subject' => 'Email Subject1', 'subject' => 'Email Subject1',
'type' => Newsletter::TYPE_STANDARD, 'type' => Newsletter::TYPE_STANDARD,
]); ]);
@ -60,24 +66,24 @@ class WorkerTest extends \MailPoetTest {
'processed_at' => null, 'processed_at' => null,
]); ]);
StatsNotification::createOrUpdate([ StatsNotification::createOrUpdate([
'newsletter_id' => $newsletter->id(), 'newsletter_id' => $this->newsletter->id(),
'task_id' => $stats_notifications_task->id(), 'task_id' => $stats_notifications_task->id(),
]); ]);
$queue = SendingQueue::createOrUpdate([ $this->queue = SendingQueue::createOrUpdate([
'newsletter_rendered_subject' => 'Email Subject', 'newsletter_rendered_subject' => 'Email Subject',
'task_id' => $sending_task->id(), 'task_id' => $sending_task->id(),
'newsletter_id' => $newsletter->id(), 'newsletter_id' => $this->newsletter->id(),
'count_processed' => 5, 'count_processed' => 5,
]); ]);
$link = NewsletterLink::createOrUpdate([ $link = NewsletterLink::createOrUpdate([
'url' => 'Link url', 'url' => 'Link url',
'newsletter_id' => $newsletter->id(), 'newsletter_id' => $this->newsletter->id(),
'queue_id' => $queue->id(), 'queue_id' => $this->queue->id(),
'hash' => 'xyz', 'hash' => 'xyz',
]); ]);
StatisticsClicks::createOrUpdate([ StatisticsClicks::createOrUpdate([
'newsletter_id' => $newsletter->id(), 'newsletter_id' => $this->newsletter->id(),
'queue_id' => $queue->id(), 'queue_id' => $this->queue->id(),
'subscriber_id' => '5', 'subscriber_id' => '5',
'link_id' => $link->id(), 'link_id' => $link->id(),
'count' => 5, 'count' => 5,
@ -85,21 +91,21 @@ class WorkerTest extends \MailPoetTest {
]); ]);
$link2 = NewsletterLink::createOrUpdate([ $link2 = NewsletterLink::createOrUpdate([
'url' => 'Link url2', 'url' => 'Link url2',
'newsletter_id' => $newsletter->id(), 'newsletter_id' => $this->newsletter->id(),
'queue_id' => $queue->id(), 'queue_id' => $this->queue->id(),
'hash' => 'xyzd', 'hash' => 'xyzd',
]); ]);
StatisticsClicks::createOrUpdate([ StatisticsClicks::createOrUpdate([
'newsletter_id' => $newsletter->id(), 'newsletter_id' => $this->newsletter->id(),
'queue_id' => $queue->id(), 'queue_id' => $this->queue->id(),
'subscriber_id' => '6', 'subscriber_id' => '6',
'link_id' => $link2->id(), 'link_id' => $link2->id(),
'count' => 5, 'count' => 5,
'created_at' => '2018-01-02 15:16:17', 'created_at' => '2018-01-02 15:16:17',
]); ]);
StatisticsClicks::createOrUpdate([ StatisticsClicks::createOrUpdate([
'newsletter_id' => $newsletter->id(), 'newsletter_id' => $this->newsletter->id(),
'queue_id' => $queue->id(), 'queue_id' => $this->queue->id(),
'subscriber_id' => '7', 'subscriber_id' => '7',
'link_id' => $link2->id(), 'link_id' => $link2->id(),
'count' => 5, 'count' => 5,
@ -107,20 +113,20 @@ class WorkerTest extends \MailPoetTest {
]); ]);
StatisticsOpens::createOrUpdate([ StatisticsOpens::createOrUpdate([
'subscriber_id' => '10', 'subscriber_id' => '10',
'newsletter_id' => $newsletter->id(), 'newsletter_id' => $this->newsletter->id(),
'queue_id' => $queue->id(), 'queue_id' => $this->queue->id(),
'created_at' => '2017-01-02 12:23:45', 'created_at' => '2017-01-02 12:23:45',
]); ]);
StatisticsOpens::createOrUpdate([ StatisticsOpens::createOrUpdate([
'subscriber_id' => '11', 'subscriber_id' => '11',
'newsletter_id' => $newsletter->id(), 'newsletter_id' => $this->newsletter->id(),
'queue_id' => $queue->id(), 'queue_id' => $this->queue->id(),
'created_at' => '2017-01-02 21:23:45', 'created_at' => '2017-01-02 21:23:45',
]); ]);
StatisticsUnsubscribes::createOrUpdate([ StatisticsUnsubscribes::createOrUpdate([
'subscriber_id' => '12', 'subscriber_id' => '12',
'newsletter_id' => $newsletter->id(), 'newsletter_id' => $this->newsletter->id(),
'queue_id' => $queue->id(), 'queue_id' => $this->queue->id(),
'created_at' => '2017-01-02 21:23:45', 'created_at' => '2017-01-02 21:23:45',
]); ]);
} }
@ -189,6 +195,48 @@ class WorkerTest extends \MailPoetTest {
$this->stats_notifications->process(); $this->stats_notifications->process();
} }
function testReplacesShortcodeLinks() {
$link = NewsletterLink::createOrUpdate([
'url' => '[link:subscription_manage_url]',
'newsletter_id' => $this->newsletter->id(),
'queue_id' => $this->queue->id(),
'hash' => 'xyzd',
]);
StatisticsClicks::createOrUpdate([
'newsletter_id' => $this->newsletter->id(),
'queue_id' => $this->queue->id(),
'subscriber_id' => '6',
'link_id' => $link->id(),
'count' => 1505,
'created_at' => '2018-01-02 15:16:17',
]);
StatisticsClicks::createOrUpdate([
'newsletter_id' => $this->newsletter->id(),
'queue_id' => $this->queue->id(),
'subscriber_id' => '7',
'link_id' => $link->id(),
'count' => 2,
'created_at' => '2018-01-02 15:16:17',
]);
StatisticsClicks::createOrUpdate([
'newsletter_id' => $this->newsletter->id(),
'queue_id' => $this->queue->id(),
'subscriber_id' => '8',
'link_id' => $link->id(),
'count' => 2,
'created_at' => '2018-01-02 15:16:17',
]);
$this->renderer->expects($this->exactly(2)) // html + text template
->method('render')
->with(
$this->anything(),
$this->callback(function($context){
return ($context['topLink'] === 'Manage subscription link');
}));
$this->stats_notifications->process();
}
function testSends() { function testSends() {
$this->mailer->expects($this->once()) $this->mailer->expects($this->once())
->method('send'); ->method('send');