More logical time handling

This commit is contained in:
Dane Everitt 2018-08-31 21:00:13 -07:00
parent e5636405f3
commit 178b8f8ce6
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
3 changed files with 27 additions and 15 deletions

View file

@ -3,9 +3,9 @@
namespace Tests\Unit\Services\Schedules;
use Mockery as m;
use Carbon\Carbon;
use Tests\TestCase;
use Cron\CronExpression;
use Cake\Chronos\Chronos;
use Pterodactyl\Models\Task;
use Pterodactyl\Models\Schedule;
use Pterodactyl\Services\Schedules\Tasks\RunTaskService;
@ -40,7 +40,8 @@ class ProcessScheduleServiceTest extends TestCase
public function setUp()
{
parent::setUp();
Carbon::setTestNow(Carbon::now());
Chronos::setTestNow(Chronos::now());
$this->repository = m::mock(ScheduleRepositoryInterface::class);
$this->runnerService = m::mock(RunTaskService::class);
@ -63,7 +64,7 @@ class ProcessScheduleServiceTest extends TestCase
$formatted = sprintf('%s %s %s * %s', $model->cron_minute, $model->cron_hour, $model->cron_day_of_month, $model->cron_day_of_week);
$this->repository->shouldReceive('update')->with($model->id, [
'is_processing' => true,
'next_run_at' => CronExpression::factory($formatted)->getNextRunDate(),
'next_run_at' => CronExpression::factory($formatted)->getNextRunDate()->format(Chronos::ATOM),
]);
$this->runnerService->shouldReceive('handle')->with($task)->once()->andReturnNull();
@ -83,12 +84,12 @@ class ProcessScheduleServiceTest extends TestCase
$this->repository->shouldReceive('update')->with($model->id, [
'is_processing' => true,
'next_run_at' => Carbon::now()->addSeconds(15)->toDateTimeString(),
'next_run_at' => Chronos::now()->addSeconds(15)->toAtomString(),
]);
$this->runnerService->shouldReceive('handle')->with($task)->once()->andReturnNull();
$this->service->setRunTimeOverride(Carbon::now()->addSeconds(15))->handle($model);
$this->service->setRunTimeOverride(Chronos::now()->addSeconds(15))->handle($model);
$this->assertTrue(true);
}
}