Refactor MailPoet\Cron to use new settings

[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

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'