From 456cdacf2688d5898d0d40cb0b72a067a5412d8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Jakes=CC=8C?= Date: Thu, 24 Oct 2019 09:19:21 +0200 Subject: [PATCH] Use constants from SettingsController instead of Setting model [MAILPOET-2436] --- lib/Models/Setting.php | 3 --- tests/integration/Cron/Triggers/WordPressTest.php | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/Models/Setting.php b/lib/Models/Setting.php index d94dd843c8..9a8da338cf 100644 --- a/lib/Models/Setting.php +++ b/lib/Models/Setting.php @@ -12,9 +12,6 @@ use MailPoet\WP\Functions as WPFunctions; class Setting extends Model { public static $_table = MP_SETTINGS_TABLE; - const DEFAULT_SENDING_FREQUENCY_EMAILS = 25; - const DEFAULT_SENDING_FREQUENCY_INTERVAL = 5; // in minutes - function __construct() { parent::__construct(); diff --git a/tests/integration/Cron/Triggers/WordPressTest.php b/tests/integration/Cron/Triggers/WordPressTest.php index 1b64705640..223b41a652 100644 --- a/tests/integration/Cron/Triggers/WordPressTest.php +++ b/tests/integration/Cron/Triggers/WordPressTest.php @@ -141,8 +141,8 @@ class WordPressTest extends \MailPoetTest { $this->settings->set(Mailer::MAILER_CONFIG_SETTING_NAME, [ 'method' => Mailer::METHOD_MAILPOET, 'frequency' => [ - 'emails' => Setting::DEFAULT_SENDING_FREQUENCY_EMAILS, - 'interval' => Setting::DEFAULT_SENDING_FREQUENCY_INTERVAL, + 'emails' => SettingsController::DEFAULT_SENDING_FREQUENCY_EMAILS, + 'interval' => SettingsController::DEFAULT_SENDING_FREQUENCY_INTERVAL, ], ]); $this->_addScheduledTask(BounceWorker::TASK_TYPE, $status = ScheduledTask::STATUS_SCHEDULED);