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

Replace expect()->greaterOrEquals() with verify()->greaterThanOrEqual()

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

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

4
mailpoet/tests/integration/API/JSON/v1/ImportExportTest.php
View File

@ -38,7 +38,7 @@ class ImportExportTest extends \MailPoetTest {
verify($task->getStatus())->equals(ScheduledTaskEntity::STATUS_SCHEDULED);
$now = time();
$scheduledAt = new Carbon($task->getScheduledAt());
expect($scheduledAt->timestamp)->greaterOrEquals($now - 1);
verify($scheduledAt->timestamp)->greaterThanOrEqual($now - 1);
verify($scheduledAt->timestamp)->lessThanOrEqual($now + 1);
}
@ -52,7 +52,7 @@ class ImportExportTest extends \MailPoetTest {
verify($task->getStatus())->equals(ScheduledTaskEntity::STATUS_SCHEDULED);
$now = time();
$scheduledAt = new Carbon($task->getScheduledAt());
expect($scheduledAt->timestamp)->greaterOrEquals($now - 1);
verify($scheduledAt->timestamp)->greaterThanOrEqual($now - 1);
verify($scheduledAt->timestamp)->lessThanOrEqual($now + 1);
$taskCount = $this->scheduledTasksRepository->countBy(['type' => WooCommerceSync::TASK_TYPE]);
verify($taskCount)->equals(1);

4
mailpoet/tests/integration/Config/UpdaterTest.php
View File

@ -66,7 +66,7 @@ class UpdaterTest extends \MailPoetTest {
$this
);
$result = $updater->checkForUpdate($updateTransient);
expect($result->last_checked)->greaterOrEquals($updateTransient->last_checked); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
verify($result->last_checked)->greaterThanOrEqual($updateTransient->last_checked); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
verify($result->checked[$this->pluginName])->equals($this->version);
verify($result->response[$this->pluginName]->slug)->equals($this->slug);
verify($result->response[$this->pluginName]->plugin)->equals($this->pluginName);
@ -103,7 +103,7 @@ class UpdaterTest extends \MailPoetTest {
$this
);
$result = $updater->checkForUpdate($updateTransient);
expect($result->last_checked)->greaterOrEquals($updateTransient->last_checked); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
verify($result->last_checked)->greaterThanOrEqual($updateTransient->last_checked); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
verify($result->checked[$this->pluginName])->equals($this->version);
verify($result->no_update[$this->pluginName]->slug)->equals($this->slug); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
verify($result->no_update[$this->pluginName]->plugin)->equals($this->pluginName); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps

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

@ -110,7 +110,7 @@ class CronHelperTest extends \MailPoetTest {
$cronHelper = new CronHelper($this->settings, $wp);
$cronHelper->accessDaemon('some_token');
$updatedDaemon = $cronHelper->getDaemon();
expect($updatedDaemon['run_accessed_at'])->greaterOrEquals($time);
verify($updatedDaemon['run_accessed_at'])->greaterThanOrEqual($time);
expect($updatedDaemon['run_accessed_at'])->lessThan($time + 2);
}
@ -201,7 +201,7 @@ class CronHelperTest extends \MailPoetTest {
$this->cronHelper->saveDaemonLastError('error');
$daemon = $this->cronHelper->getDaemon();
verify($daemon['last_error'])->equals('error');
expect($daemon['last_error_date'])->greaterOrEquals($time);
verify($daemon['last_error_date'])->greaterThanOrEqual($time);
}
public function testItSavesRunCompletedAt() {

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

@ -33,8 +33,8 @@ class DaemonHttpRunnerTest extends \MailPoetTest {
[]
);
$daemon = $this->diContainer->get(DaemonHttpRunner::class);
expect(strlen((string)$daemon->timer))->greaterOrEquals(5);
expect(strlen($daemon->token))->greaterOrEquals(5);
verify(strlen((string)$daemon->timer))->greaterThanOrEqual(5);
verify(strlen($daemon->token))->greaterThanOrEqual(5);
}
public function testItDoesNotRunWithoutRequestData() {
@ -241,9 +241,9 @@ class DaemonHttpRunnerTest extends \MailPoetTest {
$daemonHttpRunner->__construct($daemon, $this->cronHelper, SettingsController::getInstance(), $this->diContainer->get(WordPress::class));
$daemonHttpRunner->run($data);
$updatedDaemon = $this->settings->get(CronHelper::DAEMON_SETTING);
expect($updatedDaemon['run_started_at'])->greaterOrEquals($now);
verify($updatedDaemon['run_started_at'])->greaterThanOrEqual($now);
expect($updatedDaemon['run_started_at'])->lessThan($now + 2);
expect($updatedDaemon['run_completed_at'])->greaterOrEquals($now + 2);
verify($updatedDaemon['run_completed_at'])->greaterThanOrEqual($now + 2);
expect($updatedDaemon['run_completed_at'])->lessThan($now + 4);
}

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

@ -262,7 +262,7 @@ class SchedulerTest extends \MailPoetTest {
// return true when user exists and WP role matches the one specified for the welcome email
$result = $scheduler->verifyWPSubscriber((int)$subscriber->getId(), $newsletter, $queue);
verify($result)->true();
expect(count($this->sendingQueuesRepository->findAll()))->greaterOrEquals(1);
verify(count($this->sendingQueuesRepository->findAll()))->greaterThanOrEqual(1);
}
public function testItPassesWPSubscriberVerificationWhenSubscriberHasAnyRole() {
@ -278,7 +278,7 @@ class SchedulerTest extends \MailPoetTest {
// true when user exists and has any role
$result = $scheduler->verifyWPSubscriber((int)$subscriber->getId(), $newsletter, $queue);
verify($result)->true();
expect(count($this->sendingQueuesRepository->findAll()))->greaterOrEquals(1);
verify(count($this->sendingQueuesRepository->findAll()))->greaterThanOrEqual(1);
}
public function testItDoesNotProcessWelcomeNewsletterWhenThereAreNoSubscribersToProcess() {

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

@ -64,6 +64,6 @@ class SimpleWorkerTest extends \MailPoetTest {
// Subtract days left in the current week
$difference -= (Carbon::DAYS_PER_WEEK - (int)$currentDate->format('N'));
verify($difference)->lessThanOrEqual(7);
expect($difference)->greaterOrEquals(0);
verify($difference)->greaterThanOrEqual(0);
}
}

2
mailpoet/tests/integration/Doctrine/ConnectionFactoryTest.php
View File

@ -113,7 +113,7 @@ class ConnectionFactoryTest extends \MailPoetTest {
// check timezone, SQL mode, wait timeout
verify($result['@@session.time_zone'])->equals(Env::$dbTimezoneOffset);
expect($result['@@session.wait_timeout'])->greaterOrEquals(60);
verify($result['@@session.wait_timeout'])->greaterThanOrEqual(60);
// check "SET NAMES ... COLLATE ..."
verify($result['@@session.character_set_client'])->equals(Env::$dbCharset);

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

@ -29,7 +29,7 @@ class SubscriberCustomFieldTest extends \MailPoetTest {
$subscriberCustomField->subscriberId = $this->data[0]['subscriber_id'];
$subscriberCustomField->value = $this->data[0]['value'];
$subscriberCustomField->save();
expect($subscriberCustomField->id())->greaterOrEquals(1);
verify($subscriberCustomField->id())->greaterThanOrEqual(1);
verify($subscriberCustomField->getErrors())->false();
}

6
mailpoet/tests/integration/Newsletter/Scheduler/AutomaticEmailTest.php
View File

@ -59,7 +59,7 @@ class AutomaticEmailTest extends \MailPoetTest {
$task = $this->scheduledTasksRepository->findOneByNewsletter($newsletter);
$expectedTime = Carbon::createFromTimestamp(WPFunctions::get()->currentTime('timestamp'))->addHours(2);
$this->assertInstanceOf(ScheduledTaskEntity::class, $task);
expect($task->getId())->greaterOrEquals(1);
verify($task->getId())->greaterThanOrEqual(1);
verify($task->getPriority())->equals(SendingQueueEntity::PRIORITY_MEDIUM);
verify($task->getStatus())->equals(SendingQueueEntity::STATUS_SCHEDULED);
$this->tester->assertEqualDateTimes($expectedTime, $task->getScheduledAt(), 1);
@ -91,7 +91,7 @@ class AutomaticEmailTest extends \MailPoetTest {
$task = $this->scheduledTasksRepository->findOneByNewsletter($newsletter);
$expectedTime = Carbon::createFromTimestamp(WPFunctions::get()->currentTime('timestamp'))->addHours(2);
$this->assertInstanceOf(ScheduledTaskEntity::class, $task);
expect($task->getId())->greaterOrEquals(1);
verify($task->getId())->greaterThanOrEqual(1);
verify($task->getPriority())->equals(SendingQueueEntity::PRIORITY_MEDIUM);
verify($task->getStatus())->equals(SendingQueueEntity::STATUS_SCHEDULED);
$this->tester->assertEqualDateTimes($expectedTime, $task->getScheduledAt(), 1);
@ -189,7 +189,7 @@ class AutomaticEmailTest extends \MailPoetTest {
// scheduled task should be created
$task = $sendingQueue->getTask();
$this->assertInstanceOf(ScheduledTaskEntity::class, $task);
expect($task->getId())->greaterOrEquals(1);
verify($task->getId())->greaterThanOrEqual(1);
verify($task->getPriority())->equals(SendingQueueEntity::PRIORITY_MEDIUM);
verify($task->getStatus())->equals(SendingQueueEntity::STATUS_SCHEDULED);
$this->tester->assertEqualDateTimes($expectedTime, $task->getScheduledAt(), 1);

8
mailpoet/tests/integration/Newsletter/Scheduler/WelcomeTest.php
View File

@ -90,7 +90,7 @@ class WelcomeTest extends \MailPoetTest {
$this->entityManager->refresh($newsletter);
$queue = $newsletter->getLatestQueue();
$this->assertInstanceOf(SendingQueueEntity::class, $queue);
expect($queue->getId())->greaterOrEquals(1);
verify($queue->getId())->greaterThanOrEqual(1);
$task = $queue->getTask();
$this->assertInstanceOf(ScheduledTaskEntity::class, $task);
verify($task->getPriority())->equals(ScheduledTaskEntity::PRIORITY_HIGH);
@ -115,7 +115,7 @@ class WelcomeTest extends \MailPoetTest {
$this->entityManager->refresh($newsletter);
$queue = $newsletter->getLatestQueue();
$this->assertInstanceOf(SendingQueueEntity::class, $queue);
expect($queue->getId())->greaterOrEquals(1);
verify($queue->getId())->greaterThanOrEqual(1);
$task = $queue->getTask();
$this->assertInstanceOf(ScheduledTaskEntity::class, $task);
verify($task->getPriority())->equals(ScheduledTaskEntity::PRIORITY_HIGH);
@ -140,7 +140,7 @@ class WelcomeTest extends \MailPoetTest {
$this->entityManager->refresh($newsletter);
$queue = $newsletter->getLatestQueue();
$this->assertInstanceOf(SendingQueueEntity::class, $queue);
expect($queue->getId())->greaterOrEquals(1);
verify($queue->getId())->greaterThanOrEqual(1);
$task = $queue->getTask();
$this->assertInstanceOf(ScheduledTaskEntity::class, $task);
verify($task->getPriority())->equals(ScheduledTaskEntity::PRIORITY_HIGH);
@ -166,7 +166,7 @@ class WelcomeTest extends \MailPoetTest {
$this->entityManager->refresh($newsletter);
$queue = $newsletter->getLatestQueue();
$this->assertInstanceOf(SendingQueueEntity::class, $queue);
expect($queue->getId())->greaterOrEquals(1);
verify($queue->getId())->greaterThanOrEqual(1);
$task = $queue->getTask();
$this->assertInstanceOf(ScheduledTaskEntity::class, $task);
verify($task->getPriority())->equals(ScheduledTaskEntity::PRIORITY_HIGH);

4
mailpoet/tests/integration/Subscription/PagesTest.php
View File

@ -151,9 +151,9 @@ class PagesTest extends \MailPoetTest {
$confirmedSubscriber = $this->subscribersRepository->findOneById($subscriber->getId());
$this->assertInstanceOf(SubscriberEntity::class, $confirmedSubscriber);
verify($confirmedSubscriber->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
expect($confirmedSubscriber->getConfirmedAt())->greaterOrEquals(Carbon::createFromTimestamp($this->wp->currentTime('timestamp'))->subSecond());
verify($confirmedSubscriber->getConfirmedAt())->greaterThanOrEqual(Carbon::createFromTimestamp($this->wp->currentTime('timestamp'))->subSecond());
verify($confirmedSubscriber->getConfirmedAt())->lessThanOrEqual(Carbon::createFromTimestamp($this->wp->currentTime('timestamp'))->addSecond());
expect($confirmedSubscriber->getLastSubscribedAt())->greaterOrEquals(Carbon::createFromTimestamp($this->wp->currentTime('timestamp'))->subSecond());
verify($confirmedSubscriber->getLastSubscribedAt())->greaterThanOrEqual(Carbon::createFromTimestamp($this->wp->currentTime('timestamp'))->subSecond());
verify($confirmedSubscriber->getLastSubscribedAt())->lessThanOrEqual(Carbon::createFromTimestamp($this->wp->currentTime('timestamp'))->addSecond());
verify($confirmedSubscriber->getFirstName())->equals('First name');
}