Refactor MailPoet\Cron to use new settings
[MAILPOET-1757]
This commit is contained in:
@@ -5,12 +5,18 @@ use Codeception\Util\Stub;
|
||||
use MailPoet\Cron\Workers\KeyCheck\PremiumKeyCheck;
|
||||
use MailPoet\Models\Setting;
|
||||
use MailPoet\Services\Bridge;
|
||||
use MailPoet\Settings\SettingsController;
|
||||
|
||||
class PremiumKeyCheckTest extends \MailPoetTest {
|
||||
|
||||
/** @var SettingsController */
|
||||
private $settings;
|
||||
|
||||
function _before() {
|
||||
parent::_before();
|
||||
$this->settings = new SettingsController();
|
||||
$this->premium_key = '123457890abcdef';
|
||||
$this->worker = new PremiumKeyCheck(microtime(true));
|
||||
$this->worker = new PremiumKeyCheck($this->settings, microtime(true));
|
||||
}
|
||||
|
||||
function testItRequiresPremiumKeyToBeSpecified() {
|
||||
@@ -43,7 +49,7 @@ class PremiumKeyCheckTest extends \MailPoetTest {
|
||||
}
|
||||
|
||||
private function fillPremiumKey() {
|
||||
Setting::setValue(
|
||||
$this->settings->set(
|
||||
Bridge::PREMIUM_KEY_SETTING_NAME,
|
||||
$this->premium_key
|
||||
);
|
||||
@@ -52,4 +58,4 @@ class PremiumKeyCheckTest extends \MailPoetTest {
|
||||
function _after() {
|
||||
\ORM::raw_execute('TRUNCATE ' . Setting::$_table);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -7,6 +7,7 @@ use MailPoet\Cron\Workers\KeyCheck\SendingServiceKeyCheck;
|
||||
use MailPoet\Mailer\Mailer;
|
||||
use MailPoet\Models\Setting;
|
||||
use MailPoet\Services\Bridge;
|
||||
use MailPoet\Settings\SettingsController;
|
||||
|
||||
class SendingServiceKeyCheckTest extends \MailPoetTest {
|
||||
function _before() {
|
||||
@@ -46,7 +47,8 @@ class SendingServiceKeyCheckTest extends \MailPoetTest {
|
||||
}
|
||||
|
||||
private function setMailPoetSendingMethod() {
|
||||
Setting::setValue(
|
||||
$settings = new SettingsController();
|
||||
$settings->set(
|
||||
Mailer::MAILER_CONFIG_SETTING_NAME,
|
||||
array(
|
||||
'method' => 'MailPoet',
|
||||
@@ -58,4 +60,4 @@ class SendingServiceKeyCheckTest extends \MailPoetTest {
|
||||
function _after() {
|
||||
\ORM::raw_execute('TRUNCATE ' . Setting::$_table);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user