Replace old models with Doctrine code in SettingsTest
[MAILPOET-4378]
This commit is contained in:
committed by
Oluwaseun Olorunsola
parent
c3ab2fffec
commit
8191af6a23
@@ -14,7 +14,6 @@ use MailPoet\Entities\ScheduledTaskEntity;
|
|||||||
use MailPoet\Form\FormMessageController;
|
use MailPoet\Form\FormMessageController;
|
||||||
use MailPoet\Mailer\Mailer;
|
use MailPoet\Mailer\Mailer;
|
||||||
use MailPoet\Mailer\MailerLog;
|
use MailPoet\Mailer\MailerLog;
|
||||||
use MailPoet\Models\ScheduledTask;
|
|
||||||
use MailPoet\Newsletter\NewslettersRepository;
|
use MailPoet\Newsletter\NewslettersRepository;
|
||||||
use MailPoet\Newsletter\Sending\ScheduledTasksRepository;
|
use MailPoet\Newsletter\Sending\ScheduledTasksRepository;
|
||||||
use MailPoet\Segments\SegmentsRepository;
|
use MailPoet\Segments\SegmentsRepository;
|
||||||
@@ -31,7 +30,6 @@ use MailPoet\WooCommerce\TransactionalEmails;
|
|||||||
use MailPoet\WP\Functions as WPFunctions;
|
use MailPoet\WP\Functions as WPFunctions;
|
||||||
use MailPoetVendor\Carbon\Carbon;
|
use MailPoetVendor\Carbon\Carbon;
|
||||||
use MailPoetVendor\Doctrine\ORM\EntityManager;
|
use MailPoetVendor\Doctrine\ORM\EntityManager;
|
||||||
use MailPoetVendor\Idiorm\ORM;
|
|
||||||
|
|
||||||
class SettingsTest extends \MailPoetTest {
|
class SettingsTest extends \MailPoetTest {
|
||||||
|
|
||||||
@@ -44,10 +42,13 @@ class SettingsTest extends \MailPoetTest {
|
|||||||
/* @var NewslettersRepository */
|
/* @var NewslettersRepository */
|
||||||
private $newsletterRepository;
|
private $newsletterRepository;
|
||||||
|
|
||||||
|
/** @var ScheduledTasksRepository */
|
||||||
|
private $scheduledTasksRepository;
|
||||||
|
|
||||||
public function _before() {
|
public function _before() {
|
||||||
parent::_before();
|
parent::_before();
|
||||||
ORM::raw_execute('TRUNCATE ' . ScheduledTask::$_table);
|
|
||||||
$this->newsletterRepository = $this->diContainer->get(NewslettersRepository::class);
|
$this->newsletterRepository = $this->diContainer->get(NewslettersRepository::class);
|
||||||
|
$this->scheduledTasksRepository = $this->diContainer->get(ScheduledTasksRepository::class);
|
||||||
$this->settings = SettingsController::getInstance();
|
$this->settings = SettingsController::getInstance();
|
||||||
$this->settings->set('some.setting.key', true);
|
$this->settings->set('some.setting.key', true);
|
||||||
$this->endpoint = new Settings(
|
$this->endpoint = new Settings(
|
||||||
@@ -224,18 +225,24 @@ class SettingsTest extends \MailPoetTest {
|
|||||||
$this->settings->set('deactivate_subscriber_after_inactive_days', 30);
|
$this->settings->set('deactivate_subscriber_after_inactive_days', 30);
|
||||||
$settings = ['deactivate_subscriber_after_inactive_days' => 30];
|
$settings = ['deactivate_subscriber_after_inactive_days' => 30];
|
||||||
$this->endpoint->set($settings);
|
$this->endpoint->set($settings);
|
||||||
$task = ScheduledTask::where('type', InactiveSubscribers::TASK_TYPE)
|
$task = $this->scheduledTasksRepository->findOneBy(
|
||||||
->whereRaw('status = ?', [ScheduledTask::STATUS_SCHEDULED])
|
[
|
||||||
->findOne();
|
'type' => InactiveSubscribers::TASK_TYPE,
|
||||||
expect($task)->false();
|
'status' => ScheduledTaskEntity::STATUS_SCHEDULED
|
||||||
|
]
|
||||||
|
);
|
||||||
|
expect($task)->null();
|
||||||
|
|
||||||
$settings = ['deactivate_subscriber_after_inactive_days' => 0];
|
$settings = ['deactivate_subscriber_after_inactive_days' => 0];
|
||||||
$this->endpoint->set($settings);
|
$this->endpoint->set($settings);
|
||||||
$task = ScheduledTask::where('type', InactiveSubscribers::TASK_TYPE)
|
$task = $this->scheduledTasksRepository->findOneBy(
|
||||||
->whereRaw('status = ?', [ScheduledTask::STATUS_SCHEDULED])
|
[
|
||||||
->findOne();
|
'type' => InactiveSubscribers::TASK_TYPE,
|
||||||
assert($task instanceof ScheduledTask);
|
'status' => ScheduledTaskEntity::STATUS_SCHEDULED
|
||||||
expect($task->scheduledAt)->lessThan(Carbon::now());
|
]
|
||||||
|
);
|
||||||
|
assert($task instanceof ScheduledTaskEntity);
|
||||||
|
expect($task->getScheduledAt())->lessThan(Carbon::now());
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testItRemovesFreeAddressOverrideOnMSSActivation() {
|
public function testItRemovesFreeAddressOverrideOnMSSActivation() {
|
||||||
|
Reference in New Issue
Block a user