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

Update Carbon usage in tests

Browse Source 
[MAILPOET-3232]
This commit is contained in:
Rostislav Wolny
2020-10-20 16:49:32 +02:00
committed by Veljko V
parent e5a671900b
commit 2352b08a3b
3 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/integration/Cron/Workers/SchedulerTest.php
View File

@@ -609,7 +609,7 @@ class SchedulerTest extends \MailPoetTest {
$task = ScheduledTask::createOrUpdate([ $task = ScheduledTask::createOrUpdate([
'type' => 'bounce', 'type' => 'bounce',
'status' => ScheduledTask::STATUS_SCHEDULED, '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); $newsletter = $this->_createNewsletter(Newsletter::TYPE_STANDARD, Newsletter::STATUS_DRAFT);
$queue = $this->_createQueue($newsletter->id); $queue = $this->_createQueue($newsletter->id);
@@ -641,7 +641,7 @@ class SchedulerTest extends \MailPoetTest {
$task = SendingTask::create(); $task = SendingTask::create();
$task->newsletterId = $newsletter->id; $task->newsletterId = $newsletter->id;
$task->status = SendingQueue::STATUS_SCHEDULED; $task->status = SendingQueue::STATUS_SCHEDULED;
$task->scheduledAt = Carbon::now()->subDay(1)->toDateTimeString(); $task->scheduledAt = Carbon::now()->subDay()->toDateTimeString();
$task->setSubscribers([$subscriber->id]); $task->setSubscribers([$subscriber->id]);
$task->save(); $task->save();
@@ -664,7 +664,7 @@ class SchedulerTest extends \MailPoetTest {
$task = SendingTask::create(); $task = SendingTask::create();
$task->newsletterId = $newsletter->id; $task->newsletterId = $newsletter->id;
$task->status = SendingQueue::STATUS_SCHEDULED; $task->status = SendingQueue::STATUS_SCHEDULED;
$task->scheduledAt = Carbon::now()->subDay(1)->toDateTimeString(); $task->scheduledAt = Carbon::now()->subDay()->toDateTimeString();
$task->setSubscribers([$subscriber->id]); $task->setSubscribers([$subscriber->id]);
$task->save(); $task->save();
$subscriber->delete(); $subscriber->delete();
@@ -695,7 +695,7 @@ class SchedulerTest extends \MailPoetTest {
$task = SendingTask::create(); $task = SendingTask::create();
$task->newsletterId = $newsletter->id; $task->newsletterId = $newsletter->id;
$task->status = SendingQueue::STATUS_SCHEDULED; $task->status = SendingQueue::STATUS_SCHEDULED;
$task->scheduledAt = Carbon::now()->subDay(1)->toDateTimeString(); $task->scheduledAt = Carbon::now()->subDay()->toDateTimeString();
$task->save(); $task->save();
// scheduled task should exist // scheduled task should exist

6
tests/integration/Logging/LogHandlerTest.php
View File

@@ -29,7 +29,7 @@ class LogHandlerTest extends \MailPoetTest {
'name' => 'old name', 'name' => 'old name',
'level' => '5', 'level' => '5',
'message' => 'xyz', 'message' => 'xyz',
'created_at' => Carbon::create()->subDays(100)->toDateTimeString(), 'created_at' => Carbon::now()->subDays(100)->toDateTimeString(),
]); ]);
$model->save(); $model->save();
$random = function() { $random = function() {
@@ -51,11 +51,13 @@ class LogHandlerTest extends \MailPoetTest {
public function testItNotPurgesOldLogs() { public function testItNotPurgesOldLogs() {
$model = Log::create(); $model = Log::create();
$date = Carbon::create();
assert($date instanceof Carbon);
$model->hydrate([ $model->hydrate([
'name' => 'old name keep', 'name' => 'old name keep',
'level' => '5', 'level' => '5',
'message' => 'xyz', 'message' => 'xyz',
'created_at' => Carbon::create()->subDays(100)->toDateTimeString(), 'created_at' => $date->subDays(100)->toDateTimeString(),
]); ]);
$model->save(); $model->save();
$random = function() { $random = function() {

12
tests/integration/Subscription/PagesTest.php
View File

@@ -54,8 +54,8 @@ class PagesTest extends \MailPoetTest {
$subscription->confirm(); $subscription->confirm();
$confirmedSubscriber = Subscriber::findOne($this->subscriber->id); $confirmedSubscriber = Subscriber::findOne($this->subscriber->id);
expect($confirmedSubscriber->status)->equals(Subscriber::STATUS_SUBSCRIBED); expect($confirmedSubscriber->status)->equals(Subscriber::STATUS_SUBSCRIBED);
expect($confirmedSubscriber->lastSubscribedAt)->greaterOrEquals(Carbon::createFromTimestamp((int)current_time('timestamp'))->subSecond(1)); expect($confirmedSubscriber->lastSubscribedAt)->greaterOrEquals(Carbon::createFromTimestamp((int)current_time('timestamp'))->subSecond());
expect($confirmedSubscriber->lastSubscribedAt)->lessOrEquals(Carbon::createFromTimestamp((int)current_time('timestamp'))->addSecond(1)); expect($confirmedSubscriber->lastSubscribedAt)->lessOrEquals(Carbon::createFromTimestamp((int)current_time('timestamp'))->addSecond());
} }
public function testItUpdatesSubscriptionOnDuplicateAttemptButDoesntSendNotification() { public function testItUpdatesSubscriptionOnDuplicateAttemptButDoesntSendNotification() {
@@ -72,10 +72,10 @@ class PagesTest extends \MailPoetTest {
$subscription->confirm(); $subscription->confirm();
$confirmedSubscriber = Subscriber::findOne($this->subscriber->id); $confirmedSubscriber = Subscriber::findOne($this->subscriber->id);
expect($confirmedSubscriber->status)->equals(Subscriber::STATUS_SUBSCRIBED); expect($confirmedSubscriber->status)->equals(Subscriber::STATUS_SUBSCRIBED);
expect($confirmedSubscriber->confirmedAt)->greaterOrEquals(Carbon::createFromTimestamp((int)current_time('timestamp'))->subSecond(1)); expect($confirmedSubscriber->confirmedAt)->greaterOrEquals(Carbon::createFromTimestamp((int)current_time('timestamp'))->subSecond());
expect($confirmedSubscriber->confirmedAt)->lessOrEquals(Carbon::createFromTimestamp((int)current_time('timestamp'))->addSecond(1)); expect($confirmedSubscriber->confirmedAt)->lessOrEquals(Carbon::createFromTimestamp((int)current_time('timestamp'))->addSecond());
expect($confirmedSubscriber->lastSubscribedAt)->greaterOrEquals(Carbon::createFromTimestamp((int)current_time('timestamp'))->subSecond(1)); expect($confirmedSubscriber->lastSubscribedAt)->greaterOrEquals(Carbon::createFromTimestamp((int)current_time('timestamp'))->subSecond());
expect($confirmedSubscriber->lastSubscribedAt)->lessOrEquals(Carbon::createFromTimestamp((int)current_time('timestamp'))->addSecond(1)); expect($confirmedSubscriber->lastSubscribedAt)->lessOrEquals(Carbon::createFromTimestamp((int)current_time('timestamp'))->addSecond());
expect($confirmedSubscriber->firstName)->equals('Updated first name'); expect($confirmedSubscriber->firstName)->equals('Updated first name');
} }