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

Skip subscribes deactivation when tracking is disabled

Browse Source 
[MAILPOET-1791]
This commit is contained in:
Rostislav Wolny
2019-04-18 08:54:49 +02:00
committed by M. Shull
parent b04e235171
commit 8be29b0863
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Cron/Workers/InactiveSubscribers.php
View File

@ -31,7 +31,8 @@ class InactiveSubscribers extends SimpleWorker {
function processTaskStrategy(ScheduledTask $task) { function processTaskStrategy(ScheduledTask $task) {
$days_to_inactive = (int)$this->settings->get('deactivate_subscriber_after_inactive_days'); $days_to_inactive = (int)$this->settings->get('deactivate_subscriber_after_inactive_days');
if ($days_to_inactive === 0) { $tracking_enabled = (bool)$this->settings->get('tracking.enabled');
if ($days_to_inactive === 0 || !$tracking_enabled) {
self::schedule(); self::schedule();
return true; return true;
} }

13
tests/integration/Cron/Workers/InactiveSubscribersTest.php
View File

@ -17,6 +17,7 @@ class InactiveSubscribersTest extends \MailPoetTest {
function _before() { function _before() {
$this->settings = new SettingsController(); $this->settings = new SettingsController();
\ORM::raw_execute('TRUNCATE ' . ScheduledTask::$_table); \ORM::raw_execute('TRUNCATE ' . ScheduledTask::$_table);
$this->settings->set('tracking.enabled', true);
parent::_before(); parent::_before();
} }
@ -38,6 +39,18 @@ class InactiveSubscribersTest extends \MailPoetTest {
expect($task->scheduled_at)->greaterThan(new Carbon()); expect($task->scheduled_at)->greaterThan(new Carbon());
} }
function testItDoesNotRunWhenTrackingIsDisabled() {
$this->settings->set('deactivate_subscriber_after_inactive_days', 10);
$this->settings->set('tracking.enabled', false);
$controller_mock = Stub::make(InactiveSubscribersController::class, [
'markInactiveSubscribers' => Stub\Expected::never(),
'markActiveSubscribers' => Stub\Expected::never(),
], $this);
$worker = new InactiveSubscribers($controller_mock, $this->settings);
$worker->processTaskStrategy(ScheduledTask::createOrUpdate([]));
}
function testItSchedulesNextRunWhenFinished() { function testItSchedulesNextRunWhenFinished() {
$this->settings->set('deactivate_subscriber_after_inactive_days', 5); $this->settings->set('deactivate_subscriber_after_inactive_days', 5);
$controller_mock = Stub::make(InactiveSubscribersController::class, [ $controller_mock = Stub::make(InactiveSubscribersController::class, [