diff --git a/tests/integration/Cron/Workers/SchedulerTest.php b/tests/integration/Cron/Workers/SchedulerTest.php index 8cca1e3abf..dbea036c8f 100644 --- a/tests/integration/Cron/Workers/SchedulerTest.php +++ b/tests/integration/Cron/Workers/SchedulerTest.php @@ -609,7 +609,7 @@ class SchedulerTest extends \MailPoetTest { $task = ScheduledTask::createOrUpdate([ 'type' => 'bounce', 'status' => ScheduledTask::STATUS_SCHEDULED, - 'scheduled_at' => Carbon::createFromTimestamp(WPFunctions::get()->currentTime('timestamp'))->addMinute(5), + 'scheduled_at' => Carbon::createFromTimestamp(WPFunctions::get()->currentTime('timestamp'))->addMinutes(5), ]); $newsletter = $this->_createNewsletter(Newsletter::TYPE_STANDARD, Newsletter::STATUS_DRAFT); $queue = $this->_createQueue($newsletter->id); @@ -641,7 +641,7 @@ class SchedulerTest extends \MailPoetTest { $task = SendingTask::create(); $task->newsletterId = $newsletter->id; $task->status = SendingQueue::STATUS_SCHEDULED; - $task->scheduledAt = Carbon::now()->subDay(1)->toDateTimeString(); + $task->scheduledAt = Carbon::now()->subDay()->toDateTimeString(); $task->setSubscribers([$subscriber->id]); $task->save(); @@ -664,7 +664,7 @@ class SchedulerTest extends \MailPoetTest { $task = SendingTask::create(); $task->newsletterId = $newsletter->id; $task->status = SendingQueue::STATUS_SCHEDULED; - $task->scheduledAt = Carbon::now()->subDay(1)->toDateTimeString(); + $task->scheduledAt = Carbon::now()->subDay()->toDateTimeString(); $task->setSubscribers([$subscriber->id]); $task->save(); $subscriber->delete(); @@ -695,7 +695,7 @@ class SchedulerTest extends \MailPoetTest { $task = SendingTask::create(); $task->newsletterId = $newsletter->id; $task->status = SendingQueue::STATUS_SCHEDULED; - $task->scheduledAt = Carbon::now()->subDay(1)->toDateTimeString(); + $task->scheduledAt = Carbon::now()->subDay()->toDateTimeString(); $task->save(); // scheduled task should exist diff --git a/tests/integration/Logging/LogHandlerTest.php b/tests/integration/Logging/LogHandlerTest.php index a4ab572802..9d317f5a86 100644 --- a/tests/integration/Logging/LogHandlerTest.php +++ b/tests/integration/Logging/LogHandlerTest.php @@ -29,7 +29,7 @@ class LogHandlerTest extends \MailPoetTest { 'name' => 'old name', 'level' => '5', 'message' => 'xyz', - 'created_at' => Carbon::create()->subDays(100)->toDateTimeString(), + 'created_at' => Carbon::now()->subDays(100)->toDateTimeString(), ]); $model->save(); $random = function() { @@ -51,11 +51,13 @@ class LogHandlerTest extends \MailPoetTest { public function testItNotPurgesOldLogs() { $model = Log::create(); + $date = Carbon::create(); + assert($date instanceof Carbon); $model->hydrate([ 'name' => 'old name keep', 'level' => '5', 'message' => 'xyz', - 'created_at' => Carbon::create()->subDays(100)->toDateTimeString(), + 'created_at' => $date->subDays(100)->toDateTimeString(), ]); $model->save(); $random = function() { diff --git a/tests/integration/Subscription/PagesTest.php b/tests/integration/Subscription/PagesTest.php index 1ab0539cb9..716c192ab7 100644 --- a/tests/integration/Subscription/PagesTest.php +++ b/tests/integration/Subscription/PagesTest.php @@ -54,8 +54,8 @@ class PagesTest extends \MailPoetTest { $subscription->confirm(); $confirmedSubscriber = Subscriber::findOne($this->subscriber->id); expect($confirmedSubscriber->status)->equals(Subscriber::STATUS_SUBSCRIBED); - expect($confirmedSubscriber->lastSubscribedAt)->greaterOrEquals(Carbon::createFromTimestamp((int)current_time('timestamp'))->subSecond(1)); - expect($confirmedSubscriber->lastSubscribedAt)->lessOrEquals(Carbon::createFromTimestamp((int)current_time('timestamp'))->addSecond(1)); + expect($confirmedSubscriber->lastSubscribedAt)->greaterOrEquals(Carbon::createFromTimestamp((int)current_time('timestamp'))->subSecond()); + expect($confirmedSubscriber->lastSubscribedAt)->lessOrEquals(Carbon::createFromTimestamp((int)current_time('timestamp'))->addSecond()); } public function testItUpdatesSubscriptionOnDuplicateAttemptButDoesntSendNotification() { @@ -72,10 +72,10 @@ class PagesTest extends \MailPoetTest { $subscription->confirm(); $confirmedSubscriber = Subscriber::findOne($this->subscriber->id); expect($confirmedSubscriber->status)->equals(Subscriber::STATUS_SUBSCRIBED); - expect($confirmedSubscriber->confirmedAt)->greaterOrEquals(Carbon::createFromTimestamp((int)current_time('timestamp'))->subSecond(1)); - expect($confirmedSubscriber->confirmedAt)->lessOrEquals(Carbon::createFromTimestamp((int)current_time('timestamp'))->addSecond(1)); - expect($confirmedSubscriber->lastSubscribedAt)->greaterOrEquals(Carbon::createFromTimestamp((int)current_time('timestamp'))->subSecond(1)); - expect($confirmedSubscriber->lastSubscribedAt)->lessOrEquals(Carbon::createFromTimestamp((int)current_time('timestamp'))->addSecond(1)); + expect($confirmedSubscriber->confirmedAt)->greaterOrEquals(Carbon::createFromTimestamp((int)current_time('timestamp'))->subSecond()); + expect($confirmedSubscriber->confirmedAt)->lessOrEquals(Carbon::createFromTimestamp((int)current_time('timestamp'))->addSecond()); + expect($confirmedSubscriber->lastSubscribedAt)->greaterOrEquals(Carbon::createFromTimestamp((int)current_time('timestamp'))->subSecond()); + expect($confirmedSubscriber->lastSubscribedAt)->lessOrEquals(Carbon::createFromTimestamp((int)current_time('timestamp'))->addSecond()); expect($confirmedSubscriber->firstName)->equals('Updated first name'); }