Move exception handling from concrete workers into processTask() [MAILPOET-2385]

This commit is contained in:
wxa
2019-09-30 07:59:33 +03:00
committed by Jack Kitterhing
parent 2a0bf3f3c8
commit 2a48d0846d
6 changed files with 29 additions and 68 deletions

View File

@ -100,25 +100,4 @@ class InactiveSubscribersTest extends \MailPoetTest {
$this->setExpectedException(\Exception::class, 'Maximum execution time has been reached.');
$worker->processTaskStrategy(ScheduledTask::createOrUpdate([]));
}
function testItWillResetTheInProgressFlagOnFail() {
$this->settings->set('deactivate_subscriber_after_inactive_days', 5);
$controller_mock = $this->createMock(InactiveSubscribersController::class);
$task = ScheduledTask::createOrUpdate([]);
$controller_mock->expects($this->once())
->method('markInactiveSubscribers')
->willThrowException(new \Exception('test error'));
try {
$worker = new InactiveSubscribers($controller_mock, $this->settings);
$worker->startProgress($task);
$worker->processTaskStrategy($task);
$this->fail('An exception should be thrown');
} catch (\Exception $e) {
expect($e->getMessage())->equals('test error');
expect($task->getMeta())->equals(['in_progress' => null]);
}
}
}