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

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

[MAILPOET-5664]
This commit is contained in:
Rodrigo Primo
2023-10-18 16:47:11 -03:00
committed by David Remer
parent b5b4106da4
commit fa9236d8c9
22 changed files with 40 additions and 40 deletions

View File

@@ -102,6 +102,6 @@ class CreateSubscriberScoreSegmentCest {
$subscribersCountText = $i->grabTextFrom('.mailpoet-segments-counter-section');
Assert::assertIsString($subscribersCountText);
preg_match('/has (\d+) subscribers/i', $subscribersCountText, $matches);
expect((int)$matches[1])->greaterThan(0);
verify((int)$matches[1])->greaterThan(0);
}
}

View File

@@ -74,7 +74,7 @@ class SegmentsTest extends \MailPoetTest {
'description' => 'Description',
'type' => 'ignore this field',
]);
expect($result['id'])->greaterThan(0);
verify($result['id'])->greaterThan(0);
verify($result['name'])->equals('Test segment123');
verify($result['description'])->equals('Description');
verify($result['type'])->equals('default');
@@ -97,7 +97,7 @@ class SegmentsTest extends \MailPoetTest {
];
$result = $this->getApi()->addList($segment);
expect($result['id'])->greaterThan(0);
verify($result['id'])->greaterThan(0);
verify($result['name'])->equals($segment['name']);
}

View File

@@ -525,7 +525,7 @@ class SubscribersTest extends \MailPoetTest {
$expectedRemoteAddr = '127.0.0.1';
$_SERVER['REMOTE_ADDR'] = $expectedRemoteAddr;
$result = $this->getApi()->addSubscriber($subscriber);
expect($result['id'])->greaterThan(0);
verify($result['id'])->greaterThan(0);
verify($result['email'])->equals($subscriber['email']);
verify($result['cf_' . $customField->getId()])->equals('test');
verify($result['source'])->equals('api');
@@ -566,7 +566,7 @@ class SubscribersTest extends \MailPoetTest {
];
$result = $this->getApi()->addSubscriber($subscriber, [$segment->getId()]);
expect($result['id'])->greaterThan(0);
verify($result['id'])->greaterThan(0);
verify($result['email'])->equals($subscriber['email']);
verify($result['subscriptions'][0]['segment_id'])->equals($segment->getId());
}

View File

@@ -45,7 +45,7 @@ class AutomationRunLogStorageTest extends \MailPoetTest {
'trace',
]);
verify($errors['trace'])->isArray();
expect(count($errors['trace']))->greaterThan(0);
verify(count($errors['trace']))->greaterThan(0);
}
public function testAutomationRunStatisticsInTimeFrame() {

View File

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

View File

@@ -141,7 +141,7 @@ class CronWorkerRunnerTest extends \MailPoetTest {
$task = $this->scheduledTasksRepository->findOneById($task->getId());
$this->assertInstanceOf(ScheduledTaskEntity::class, $task);
expect($task->getScheduledAt())->greaterThan($scheduledAt);
verify($task->getScheduledAt())->greaterThan($scheduledAt);
verify($task->getStatus())->same(ScheduledTaskEntity::STATUS_SCHEDULED);
verify($task->getInProgress())->empty();
@@ -168,7 +168,7 @@ class CronWorkerRunnerTest extends \MailPoetTest {
verify($e->getMessage())->equals('test error');
$task = $this->scheduledTasksRepository->findOneById($task->getId());
$this->assertInstanceOf(ScheduledTaskEntity::class, $task);
expect($task->getScheduledAt())->greaterThan($scheduledAt);
verify($task->getScheduledAt())->greaterThan($scheduledAt);
verify($task->getStatus())->same(ScheduledTaskEntity::STATUS_SCHEDULED);
verify($task->getRescheduleCount())->equals(1);
verify($task->getInProgress())->empty();

View File

@@ -85,8 +85,8 @@ class CronWorkerSchedulerTest extends \MailPoetTest {
verify($tasks)->arrayCount(1);
verify($tasks[0]->getType())->same('test');
verify($tasks[0]->getStatus())->same(ScheduledTaskEntity::STATUS_SCHEDULED);
expect($tasks[0]->getScheduledAt())->greaterThan($nextRunDate);
expect($tasks[0]->getScheduledAt())->greaterThan(Carbon::now());
verify($tasks[0]->getScheduledAt())->greaterThan($nextRunDate);
verify($tasks[0]->getScheduledAt())->greaterThan(Carbon::now());
}
public function testItCanRescheduleTasksProgressively() {

View File

@@ -100,7 +100,7 @@ class DaemonHttpRunnerTest extends \MailPoetTest {
$daemonHttpRunner = $this->make(DaemonHttpRunner::class, [
'pauseExecution' => Expected::exactly(1, function($pauseDelay) {
expect($pauseDelay)->lessThan($this->cronHelper->getDaemonExecutionLimit());
expect($pauseDelay)->greaterThan($this->cronHelper->getDaemonExecutionLimit() - 1);
verify($pauseDelay)->greaterThan($this->cronHelper->getDaemonExecutionLimit() - 1);
}),
'callSelf' => null,
'terminateRequest' => null,

View File

@@ -80,7 +80,7 @@ class WordPressTest extends \MailPoetTest {
$this->settings->set(WordPress::LAST_RUN_AT_SETTING, $timeInThePast);
$this->addQueue(SendingQueueEntity::STATUS_SCHEDULED);
verify($this->wordpressTrigger->run())->notEmpty();
expect($this->settings->get(WordPress::LAST_RUN_AT_SETTING))->greaterThan($timeInThePast);
verify($this->settings->get(WordPress::LAST_RUN_AT_SETTING))->greaterThan($timeInThePast);
WPFunctions::get()->removeAllFilters('mailpoet_cron_trigger_wordpress_run_interval');
}

View File

@@ -49,7 +49,7 @@ class InactiveSubscribersTest extends \MailPoetTest {
$this->assertInstanceOf(ScheduledTaskEntity::class, $task);
verify($task)->instanceOf(ScheduledTaskEntity::class);
expect($task->getScheduledAt())->greaterThan(new Carbon());
verify($task->getScheduledAt())->greaterThan(new Carbon());
}
public function testItDoesNotRunWhenTrackingIsDisabled() {
@@ -86,7 +86,7 @@ class InactiveSubscribersTest extends \MailPoetTest {
$this->assertInstanceOf(ScheduledTaskEntity::class, $task);
verify($task)->instanceOf(ScheduledTaskEntity::class);
expect($task->getScheduledAt())->greaterThan(new Carbon());
verify($task->getScheduledAt())->greaterThan(new Carbon());
}
public function testRunBatchesUntilItIsFinished() {

View File

@@ -50,7 +50,7 @@ class SendingServiceKeyCheckTest extends \MailPoetTest {
]);
$nextRunDate = $this->worker->getNextRunDate();
expect($nextRunDate)->greaterThan(Carbon::now()->addMinutes(55));
verify($nextRunDate)->greaterThan(Carbon::now()->addMinutes(55));
expect($nextRunDate)->lessThan(Carbon::now()->addMinutes(65));
}

View File

@@ -146,7 +146,7 @@ class SubscribersLifetimeEmailCountTest extends \MailPoetTest {
$this->assertInstanceOf(ScheduledTaskEntity::class, $task);
verify($task)->instanceOf(ScheduledTaskEntity::class);
expect($task->getScheduledAt())->greaterThan(new Carbon());
verify($task->getScheduledAt())->greaterThan(new Carbon());
}
private function createRunningTask(): ScheduledTaskEntity {

View File

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

View File

@@ -129,7 +129,7 @@ class ConnectionFactoryTest extends \MailPoetTest {
]);
$connection = $connectionFactory->createConnection();
$current = $connection->executeQuery('SELECT @@session.wait_timeout')->fetchColumn();
expect($current)->greaterThan(1);
verify($current)->greaterThan(1);
// timeout will be set to higher value
$connectionFactory = $this->make(ConnectionFactory::class, [

View File

@@ -41,7 +41,7 @@ class EmailEditorTest extends \MailPoetTest {
$postId = $wp->wpInsertPost(['post_type' => 'mailpoet_email']);
$newsletters = $this->newslettersRepository->findAll();
verify(count($newsletters))->equals(1);
expect($newsletters[0]->getWpPostId())->greaterThan(0);
verify($newsletters[0]->getWpPostId())->greaterThan(0);
verify($newsletters[0]->getWpPostId())->equals($postId);
// Add non-email standard post
$wp->wpInsertPost(['post_type' => 'post']);

View File

@@ -31,7 +31,7 @@ class MailerLogTest extends \MailPoetTest {
$resultExpectedGreaterThan = time() - 1;
$mailerLog = MailerLog::getMailerLog();
verify($mailerLog['sent'])->equals([]);
expect($mailerLog['started'])->greaterThan($resultExpectedGreaterThan);
verify($mailerLog['started'])->greaterThan($resultExpectedGreaterThan);
}
public function testItDoesNotIncrementWhenSendingMethodIsMailpoet() {
@@ -62,7 +62,7 @@ class MailerLogTest extends \MailPoetTest {
$resultExpectedGreaterThan = time() - 1;
$mailerLog = MailerLog::createMailerLog();
verify($mailerLog['sent'])->equals([]);
expect($mailerLog['started'])->greaterThan($resultExpectedGreaterThan);
verify($mailerLog['started'])->greaterThan($resultExpectedGreaterThan);
}
public function testItResetsMailerLog() {
@@ -75,7 +75,7 @@ class MailerLogTest extends \MailPoetTest {
MailerLog::resetMailerLog();
$updatedMailerLog = $this->settings->get(MailerLog::SETTING_NAME);
verify($updatedMailerLog['sent'])->equals([]);
expect($updatedMailerLog['started'])->greaterThan($mailerLog['started']);
verify($updatedMailerLog['started'])->greaterThan($mailerLog['started']);
}
public function testItUpdatesMailerLog() {
@@ -219,7 +219,7 @@ class MailerLogTest extends \MailPoetTest {
MailerLog::processError($operation = 'send', $error = 'email rejected');
$mailerLog = MailerLog::getMailerLog();
verify($mailerLog['retry_attempt'])->equals(1);
expect($mailerLog['retry_at'])->greaterThan(time());
verify($mailerLog['retry_at'])->greaterThan(time());
verify($mailerLog['error'])->equals(
[
'operation' => 'send',
@@ -237,7 +237,7 @@ class MailerLogTest extends \MailPoetTest {
MailerLog::processNonBlockingError($operation = 'send', $error = 'email rejected');
$mailerLog = MailerLog::getMailerLog();
verify($mailerLog['retry_attempt'])->equals(1);
expect($mailerLog['retry_at'])->greaterThan(time());
verify($mailerLog['retry_at'])->greaterThan(time());
verify($mailerLog['error'])->equals(
[
'operation' => 'send',

View File

@@ -142,7 +142,7 @@ class SubscriberTest extends \MailPoetTest {
->findOne();
$lastSubscribedAt = new Carbon($subscriberUpdated->lastUpdatedAt);
expect($lastSubscribedAt)->lessThan((new Carbon())->addSeconds(2));
expect($lastSubscribedAt)->greaterThan((new Carbon())->subSeconds(2));
verify($lastSubscribedAt)->greaterThan((new Carbon())->subSeconds(2));
// Change to other status keeps last_updated_at
$lastSubscribedAt = (new Carbon())->subHour();

View File

@@ -62,7 +62,7 @@ class SubscriberActivityTrackerTest extends \MailPoetTest {
$result = $this->tracker->trackActivity();
verify($result)->true();
$this->entityManager->refresh($subscriber);
expect($subscriber->getLastEngagementAt())->greaterThan($oldEngagementTime);
verify($subscriber->getLastEngagementAt())->greaterThan($oldEngagementTime);
}
public function testItFiresActionWhenActivityIsTracked() {
@@ -104,9 +104,9 @@ class SubscriberActivityTrackerTest extends \MailPoetTest {
verify($result)->true();
$subscriber = $this->entityManager->getRepository(SubscriberEntity::class)->findOneBy(['wpUserId' => $user->ID]);
$this->assertInstanceOf(SubscriberEntity::class, $subscriber);
expect($subscriber->getLastEngagementAt())->greaterThan(Carbon::now()->subMinute());
verify($subscriber->getLastEngagementAt())->greaterThan(Carbon::now()->subMinute());
expect($subscriber->getLastEngagementAt())->lessThan(Carbon::now()->addMinute());
expect($subscriber->getLastPageViewAt())->greaterThan(Carbon::now()->subMinute());
verify($subscriber->getLastPageViewAt())->greaterThan(Carbon::now()->subMinute());
expect($subscriber->getLastPageViewAt())->lessThan(Carbon::now()->addMinute());
}
@@ -145,7 +145,7 @@ class SubscriberActivityTrackerTest extends \MailPoetTest {
$result = $tracker->trackActivity();
verify($result)->true();
$this->entityManager->refresh($subscriber);
expect($subscriber->getLastEngagementAt())->greaterThan(Carbon::now()->subMinute());
verify($subscriber->getLastEngagementAt())->greaterThan(Carbon::now()->subMinute());
expect($subscriber->getLastEngagementAt())->lessThan(Carbon::now()->addMinute());
}
@@ -164,7 +164,7 @@ class SubscriberActivityTrackerTest extends \MailPoetTest {
$result = $this->tracker->trackActivity();
verify($result)->true();
$this->entityManager->refresh($subscriber);
expect($subscriber->getLastEngagementAt())->greaterThan(Carbon::now()->subMinute());
verify($subscriber->getLastEngagementAt())->greaterThan(Carbon::now()->subMinute());
expect($subscriber->getLastEngagementAt())->lessThan(Carbon::now()->addMinute());
}

View File

@@ -38,7 +38,7 @@ class ThrottlingTest extends \MailPoetTest {
verify($this->throttling->throttle())->equals(false);
verify($this->throttling->throttle())->equals(false);
$wp->removeFilter('mailpoet_subscription_limit_enabled', '__return_false');
expect($this->throttling->throttle())->greaterThan(0);
verify($this->throttling->throttle())->greaterThan(0);
}
public function testItDoesNotThrottleForExemptRoleUsers() {
@@ -48,7 +48,7 @@ class ThrottlingTest extends \MailPoetTest {
verify($this->throttling->throttle())->equals(false);
verify($this->throttling->throttle())->equals(false);
wp_set_current_user(0);
expect($this->throttling->throttle())->greaterThan(0);
verify($this->throttling->throttle())->greaterThan(0);
}
public function testItThrottlesForNotExemptRoleUsers() {

View File

@@ -73,7 +73,7 @@ class SubscriberEngagementTest extends \MailPoetTest {
$this->assertInstanceOf(DateTimeInterface::class, $engagementTime);
$this->assertInstanceOf(DateTimeInterface::class, $purchaseTime);
verify($engagementTime)->equals($purchaseTime);
expect($engagementTime)->greaterThan(Carbon::now()->subMinute());
verify($engagementTime)->greaterThan(Carbon::now()->subMinute());
}
public function testItDoesntThrowAnErrorForNonExistingSubscriber() {

View File

@@ -39,7 +39,7 @@ class LoggerFactoryTest extends \MailPoetUnitTest {
public function testItAttachesProcessors() {
$logger1 = $this->loggerFactory->getLogger('logger-with-processors', true);
$processors = $logger1->getProcessors();
expect(count($processors))->greaterThan(1);
verify(count($processors))->greaterThan(1);
}
public function testItSkipsOptionalProcessors() {

View File

@@ -10,8 +10,8 @@ class HostsTest extends \MailPoetUnitTest {
verify($webHosts)->notEmpty();
foreach ($webHosts as $host) {
expect($host['interval'])->greaterThan(0);
expect($host['emails'])->greaterThan(0);
verify($host['interval'])->greaterThan(0);
verify($host['emails'])->greaterThan(0);
}
}
@@ -20,8 +20,8 @@ class HostsTest extends \MailPoetUnitTest {
verify($smtpHosts)->notEmpty();
foreach ($smtpHosts as $host) {
expect($host['interval'])->greaterThan(0);
expect($host['emails'])->greaterThan(0);
verify($host['interval'])->greaterThan(0);
verify($host['emails'])->greaterThan(0);
}
}
}