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

Replace expect()->lessThan() with verify()->lessThan()

Browse Source 
codeception/verify 2.1 removed support for expect()->lessThan() so we need
to replace it with verify()->lessThan().

[MAILPOET-5664]
This commit is contained in:
Rodrigo Primo
2023-10-18 16:59:27 -03:00
committed by David Remer
parent a54e1f3c01
commit 2ced2b4afa
10 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mailpoet/tests/integration/API/JSON/v1/SettingsTest.php
View File

@@ -253,7 +253,7 @@ class SettingsTest extends \MailPoetTest {
] ]
); );
$this->assertInstanceOf(ScheduledTaskEntity::class, $task); $this->assertInstanceOf(ScheduledTaskEntity::class, $task);
expect($task->getScheduledAt())->lessThan(Carbon::now()); verify($task->getScheduledAt())->lessThan(Carbon::now());
} }
public function testItRemovesFreeAddressOverrideOnMSSActivation() { public function testItRemovesFreeAddressOverrideOnMSSActivation() {

2
mailpoet/tests/integration/Cron/ActionScheduler/Actions/DaemonRunTest.php
View File

@@ -67,7 +67,7 @@ class DaemonRunTest extends \MailPoetTest {
// Verify execution limit after run. floor(30 - some time taken by previous action) - 10s (safety execution timout margin) // Verify execution limit after run. floor(30 - some time taken by previous action) - 10s (safety execution timout margin)
verify($this->daemonRun->getDaemonExecutionLimit())->greaterThan(0); verify($this->daemonRun->getDaemonExecutionLimit())->greaterThan(0);
expect($this->daemonRun->getDaemonExecutionLimit())->lessThan(20); verify($this->daemonRun->getDaemonExecutionLimit())->lessThan(20);
} }
public function testItDoesNotContinueWhenThePreviousRunSuspiciouslyShort() { public function testItDoesNotContinueWhenThePreviousRunSuspiciouslyShort() {

2
mailpoet/tests/integration/Cron/CronHelperTest.php
View File

@@ -111,7 +111,7 @@ class CronHelperTest extends \MailPoetTest {
$cronHelper->accessDaemon('some_token'); $cronHelper->accessDaemon('some_token');
$updatedDaemon = $cronHelper->getDaemon(); $updatedDaemon = $cronHelper->getDaemon();
verify($updatedDaemon['run_accessed_at'])->greaterThanOrEqual($time); verify($updatedDaemon['run_accessed_at'])->greaterThanOrEqual($time);
expect($updatedDaemon['run_accessed_at'])->lessThan($time + 2); verify($updatedDaemon['run_accessed_at'])->lessThan($time + 2);
} }
public function testItThrowsAnExceptionIfAccessingNonExistingDaemon() { public function testItThrowsAnExceptionIfAccessingNonExistingDaemon() {

6
mailpoet/tests/integration/Cron/DaemonHttpRunnerTest.php
View File

@@ -99,7 +99,7 @@ class DaemonHttpRunnerTest extends \MailPoetTest {
$daemon = $this->makeEmpty(Daemon::class); $daemon = $this->makeEmpty(Daemon::class);
$daemonHttpRunner = $this->make(DaemonHttpRunner::class, [ $daemonHttpRunner = $this->make(DaemonHttpRunner::class, [
'pauseExecution' => Expected::exactly(1, function($pauseDelay) { 'pauseExecution' => Expected::exactly(1, function($pauseDelay) {
expect($pauseDelay)->lessThan($this->cronHelper->getDaemonExecutionLimit()); verify($pauseDelay)->lessThan($this->cronHelper->getDaemonExecutionLimit());
verify($pauseDelay)->greaterThan($this->cronHelper->getDaemonExecutionLimit() - 1); verify($pauseDelay)->greaterThan($this->cronHelper->getDaemonExecutionLimit() - 1);
}), }),
'callSelf' => null, 'callSelf' => null,
@@ -242,9 +242,9 @@ class DaemonHttpRunnerTest extends \MailPoetTest {
$daemonHttpRunner->run($data); $daemonHttpRunner->run($data);
$updatedDaemon = $this->settings->get(CronHelper::DAEMON_SETTING); $updatedDaemon = $this->settings->get(CronHelper::DAEMON_SETTING);
verify($updatedDaemon['run_started_at'])->greaterThanOrEqual($now); verify($updatedDaemon['run_started_at'])->greaterThanOrEqual($now);
expect($updatedDaemon['run_started_at'])->lessThan($now + 2); verify($updatedDaemon['run_started_at'])->lessThan($now + 2);
verify($updatedDaemon['run_completed_at'])->greaterThanOrEqual($now + 2); verify($updatedDaemon['run_completed_at'])->greaterThanOrEqual($now + 2);
expect($updatedDaemon['run_completed_at'])->lessThan($now + 4); verify($updatedDaemon['run_completed_at'])->lessThan($now + 4);
} }
public function testItCanRun() { public function testItCanRun() {

4
mailpoet/tests/integration/Cron/Workers/KeyCheck/SendingServiceKeyCheckTest.php
View File

@@ -38,7 +38,7 @@ class SendingServiceKeyCheckTest extends \MailPoetTest {
$nextRun = $this->worker->getNextRunDate(); $nextRun = $this->worker->getNextRunDate();
$nextDay = Carbon::now()->startOfDay()->addDay()->addHours(6); $nextDay = Carbon::now()->startOfDay()->addDay()->addHours(6);
verify($nextRun->format('Y-m-d'))->equals($nextDay->format('Y-m-d')); verify($nextRun->format('Y-m-d'))->equals($nextDay->format('Y-m-d'));
expect($nextRun)->lessThan($nextDay); verify($nextRun)->lessThan($nextDay);
// when pending key approval, next run is scheduled in an hour // when pending key approval, next run is scheduled in an hour
$settings = $this->diContainer->get(SettingsController::class); $settings = $this->diContainer->get(SettingsController::class);
@@ -51,7 +51,7 @@ class SendingServiceKeyCheckTest extends \MailPoetTest {
$nextRunDate = $this->worker->getNextRunDate(); $nextRunDate = $this->worker->getNextRunDate();
verify($nextRunDate)->greaterThan(Carbon::now()->addMinutes(55)); verify($nextRunDate)->greaterThan(Carbon::now()->addMinutes(55));
expect($nextRunDate)->lessThan(Carbon::now()->addMinutes(65)); verify($nextRunDate)->lessThan(Carbon::now()->addMinutes(65));
} }
public function testItResumesSendingWhenKeyApproved() { public function testItResumesSendingWhenKeyApproved() {

2
mailpoet/tests/integration/Cron/Workers/SchedulerTest.php
View File

@@ -714,7 +714,7 @@ class SchedulerTest extends \MailPoetTest {
$scheduler->processScheduledStandardNewsletter($newsletter, $queue); $scheduler->processScheduledStandardNewsletter($newsletter, $queue);
$refetchedTask = $this->scheduledTasksRepository->findOneById($task->getId()); $refetchedTask = $this->scheduledTasksRepository->findOneById($task->getId());
$this->assertInstanceOf(ScheduledTaskEntity::class, $refetchedTask); $this->assertInstanceOf(ScheduledTaskEntity::class, $refetchedTask);
expect($refetchedTask->getScheduledAt())->lessThan(Carbon::createFromTimestamp(WPFunctions::get()->currentTime('timestamp'))->addHours(1)); verify($refetchedTask->getScheduledAt())->lessThan(Carbon::createFromTimestamp(WPFunctions::get()->currentTime('timestamp'))->addHours(1));
} }
/** /**

2
mailpoet/tests/integration/Cron/Workers/SendingQueue/SendingQueueTest.php
View File

@@ -1196,7 +1196,7 @@ class SendingQueueTest extends \MailPoetTest {
$refetchedTask = ScheduledTask::where('id', $task->id)->findOne(); $refetchedTask = ScheduledTask::where('id', $task->id)->findOne();
$this->assertInstanceOf(ScheduledTask::class, $refetchedTask); // PHPStan $this->assertInstanceOf(ScheduledTask::class, $refetchedTask); // PHPStan
expect($refetchedTask->scheduledAt)->lessThan(Carbon::createFromTimestamp(WPFunctions::get()->currentTime('timestamp'))->addHours(42)); verify($refetchedTask->scheduledAt)->lessThan(Carbon::createFromTimestamp(WPFunctions::get()->currentTime('timestamp'))->addHours(42));
} }
public function testDoesNoRescheduleBounceTaskWhenPlannedInNearFuture() { public function testDoesNoRescheduleBounceTaskWhenPlannedInNearFuture() {

4
mailpoet/tests/integration/Cron/Workers/SubscribersStatsReportTest.php
View File

@@ -106,11 +106,11 @@ class SubscribersStatsReportTest extends \MailPoetTest {
$result = $this->worker->getNextRunDate(); $result = $this->worker->getNextRunDate();
verify($result)->instanceOf(Carbon::class); verify($result)->instanceOf(Carbon::class);
verify($result->getTimestamp())->greaterThan($time); verify($result->getTimestamp())->greaterThan($time);
expect($result->getTimestamp())->lessThan($time + $maxExpectedScheduleInterval); verify($result->getTimestamp())->lessThan($time + $maxExpectedScheduleInterval);
$result2 = $this->worker->getNextRunDate(); $result2 = $this->worker->getNextRunDate();
verify($result2)->instanceOf(Carbon::class); verify($result2)->instanceOf(Carbon::class);
verify($result2->getTimestamp())->greaterThan($time); verify($result2->getTimestamp())->greaterThan($time);
expect($result2->getTimestamp())->lessThan($time + $maxExpectedScheduleInterval); verify($result2->getTimestamp())->lessThan($time + $maxExpectedScheduleInterval);
verify($result2->getTimestamp())->notEquals($result->getTimestamp()); verify($result2->getTimestamp())->notEquals($result->getTimestamp());
} }
} }

2
mailpoet/tests/integration/Models/SubscriberTest.php
View File

@@ -141,7 +141,7 @@ class SubscriberTest extends \MailPoetTest {
$subscriberUpdated = Subscriber::where('email', $this->testData['email']) $subscriberUpdated = Subscriber::where('email', $this->testData['email'])
->findOne(); ->findOne();
$lastSubscribedAt = new Carbon($subscriberUpdated->lastUpdatedAt); $lastSubscribedAt = new Carbon($subscriberUpdated->lastUpdatedAt);
expect($lastSubscribedAt)->lessThan((new Carbon())->addSeconds(2)); verify($lastSubscribedAt)->lessThan((new Carbon())->addSeconds(2));
verify($lastSubscribedAt)->greaterThan((new Carbon())->subSeconds(2)); verify($lastSubscribedAt)->greaterThan((new Carbon())->subSeconds(2));
// Change to other status keeps last_updated_at // Change to other status keeps last_updated_at

8
mailpoet/tests/integration/Statistics/Track/SubscriberActivityTrackerTest.php
View File

@@ -105,9 +105,9 @@ class SubscriberActivityTrackerTest extends \MailPoetTest {
$subscriber = $this->entityManager->getRepository(SubscriberEntity::class)->findOneBy(['wpUserId' => $user->ID]); $subscriber = $this->entityManager->getRepository(SubscriberEntity::class)->findOneBy(['wpUserId' => $user->ID]);
$this->assertInstanceOf(SubscriberEntity::class, $subscriber); $this->assertInstanceOf(SubscriberEntity::class, $subscriber);
verify($subscriber->getLastEngagementAt())->greaterThan(Carbon::now()->subMinute()); verify($subscriber->getLastEngagementAt())->greaterThan(Carbon::now()->subMinute());
expect($subscriber->getLastEngagementAt())->lessThan(Carbon::now()->addMinute()); verify($subscriber->getLastEngagementAt())->lessThan(Carbon::now()->addMinute());
verify($subscriber->getLastPageViewAt())->greaterThan(Carbon::now()->subMinute()); verify($subscriber->getLastPageViewAt())->greaterThan(Carbon::now()->subMinute());
expect($subscriber->getLastPageViewAt())->lessThan(Carbon::now()->addMinute()); verify($subscriber->getLastPageViewAt())->lessThan(Carbon::now()->addMinute());
} }
/** /**
@@ -146,7 +146,7 @@ class SubscriberActivityTrackerTest extends \MailPoetTest {
verify($result)->true(); verify($result)->true();
$this->entityManager->refresh($subscriber); $this->entityManager->refresh($subscriber);
verify($subscriber->getLastEngagementAt())->greaterThan(Carbon::now()->subMinute()); verify($subscriber->getLastEngagementAt())->greaterThan(Carbon::now()->subMinute());
expect($subscriber->getLastEngagementAt())->lessThan(Carbon::now()->addMinute()); verify($subscriber->getLastEngagementAt())->lessThan(Carbon::now()->addMinute());
} }
public function testItUpdatesSubscriberEngagementForWpUserEvenWithDisabledCookieTracking() { public function testItUpdatesSubscriberEngagementForWpUserEvenWithDisabledCookieTracking() {
@@ -165,7 +165,7 @@ class SubscriberActivityTrackerTest extends \MailPoetTest {
verify($result)->true(); verify($result)->true();
$this->entityManager->refresh($subscriber); $this->entityManager->refresh($subscriber);
verify($subscriber->getLastEngagementAt())->greaterThan(Carbon::now()->subMinute()); verify($subscriber->getLastEngagementAt())->greaterThan(Carbon::now()->subMinute());
expect($subscriber->getLastEngagementAt())->lessThan(Carbon::now()->addMinute()); verify($subscriber->getLastEngagementAt())->lessThan(Carbon::now()->addMinute());
} }
public function testItDoesntTrackWhenCookieTrackingIsDisabledAndThereInNoWPUser() { public function testItDoesntTrackWhenCookieTrackingIsDisabledAndThereInNoWPUser() {