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

Refactor MailPoet\Cron to use new settings

Browse Source 
[MAILPOET-1757]
This commit is contained in:
Rostislav Wolny
2019-01-30 13:57:18 +01:00
parent 6e79705128
commit ff238bf69a
21 changed files with 174 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/integration/Cron/Workers/SendingQueue/SendingQueueTest.php
View File

@@ -29,6 +29,7 @@ use MailPoet\Models\SubscriberSegment;
use MailPoet\Newsletter\Links\Links;
use MailPoet\Router\Endpoints\Track;
use MailPoet\Router\Router;
use MailPoet\Settings\SettingsController;
use MailPoet\Subscription\Url;
use MailPoet\Tasks\Sending as SendingTask;
use MailPoet\WP\Functions as WPFunctions;
@@ -36,7 +37,8 @@ use MailPoet\WP\Functions as WPFunctions;
class SendingQueueTest extends \MailPoetTest {
/** @var SendingErrorHandler */
private $sending_error_handler;
/** @var SettingsController */
private $settings;
/** @var Scheduler */
private $stats_notifications_worker;
@@ -83,6 +85,7 @@ class SendingQueueTest extends \MailPoetTest {
$this->sending_error_handler = new SendingErrorHandler();
$this->stats_notifications_worker = new StatsNotificationsScheduler();
$this->sending_queue_worker = new SendingQueueWorker($this->sending_error_handler, $this->stats_notifications_worker);
$this->settings = new SettingsController();
}
private function getDirectUnsubscribeURL() {
@@ -229,7 +232,7 @@ class SendingQueueTest extends \MailPoetTest {
}
function testItPassesExtraParametersToMailerWhenTrackingIsDisabled() {
Setting::setValue('tracking.enabled', false);
$this->settings->set('tracking.enabled', false);
$directUnsubscribeURL = $this->getDirectUnsubscribeURL();
$sending_queue_worker = new SendingQueueWorker(
$this->sending_error_handler,
@@ -251,7 +254,7 @@ class SendingQueueTest extends \MailPoetTest {
}
function testItPassesExtraParametersToMailerWhenTrackingIsEnabled() {
Setting::setValue('tracking.enabled', true);
$this->settings->set('tracking.enabled', true);
$trackedUnsubscribeURL = $this->getTrackedUnsubscribeURL();
$sending_queue_worker = new SendingQueueWorker(
$this->sending_error_handler,
@@ -680,6 +683,7 @@ class SendingQueueTest extends \MailPoetTest {
\ORM::raw_execute('TRUNCATE ' . ScheduledTaskSubscriber::$_table);
\ORM::raw_execute('TRUNCATE ' . Segment::$_table);
\ORM::raw_execute('TRUNCATE ' . SendingQueue::$_table);
\ORM::raw_execute('TRUNCATE ' . Setting::$_table);
\ORM::raw_execute('TRUNCATE ' . Newsletter::$_table);
\ORM::raw_execute('TRUNCATE ' . NewsletterLink::$_table);
\ORM::raw_execute('TRUNCATE ' . NewsletterPost::$_table);

12
tests/integration/Cron/Workers/SendingQueue/Tasks/MailerTest.php
View File

@@ -8,6 +8,7 @@ use MailPoet\Cron\Workers\SendingQueue\Tasks\Mailer as MailerTask;
use MailPoet\Mailer\Mailer;
use MailPoet\Models\Setting;
use MailPoet\Models\Subscriber;
use MailPoet\Settings\SettingsController;
if(!defined('ABSPATH')) exit;
@@ -15,6 +16,8 @@ class MailerTest extends \MailPoetTest {
/** @var MailerTask */
public $mailer_task;
public $sender;
/** @var SettingsController */
private $settings;
function _before() {
parent::_before();
@@ -23,7 +26,8 @@ class MailerTest extends \MailPoetTest {
$populator = new Populator();
$populator->up();
$this->mailer_task = new MailerTask();
$this->sender = Setting::getValue('sender');
$this->settings = new SettingsController();
$this->sender = $this->settings->get('sender');
}
function testConfiguresMailerWhenItConstructs() {
@@ -68,7 +72,7 @@ class MailerTest extends \MailPoetTest {
function testItGetsProcessingMethod() {
// when using MailPoet method, newsletters should be processed in bulk
Setting::setValue(
$this->settings->set(
Mailer::MAILER_CONFIG_SETTING_NAME,
array(
'method' => 'MailPoet',
@@ -79,7 +83,7 @@ class MailerTest extends \MailPoetTest {
expect($mailer_task->getProcessingMethod())->equals('bulk');
// when using other methods, newsletters should be processed individually
Setting::setValue(
$this->settings->set(
Mailer::MAILER_CONFIG_SETTING_NAME,
array(
'method' => 'PHPMail'
@@ -101,7 +105,7 @@ class MailerTest extends \MailPoetTest {
function testItCanSend() {
$php_mail_class = 'MailPoet\Mailer\Methods\PHPMail';
Setting::setValue(
$this->settings->set(
Mailer::MAILER_CONFIG_SETTING_NAME,
array(
'method' => 'PHPMail'