diff --git a/mailpoet/tests/integration/API/JSON/v1/ImportExportTest.php b/mailpoet/tests/integration/API/JSON/v1/ImportExportTest.php index 03d85affaa..f357d31dd5 100644 --- a/mailpoet/tests/integration/API/JSON/v1/ImportExportTest.php +++ b/mailpoet/tests/integration/API/JSON/v1/ImportExportTest.php @@ -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); diff --git a/mailpoet/tests/integration/Config/UpdaterTest.php b/mailpoet/tests/integration/Config/UpdaterTest.php index 29dfba1d58..eb0e824c13 100644 --- a/mailpoet/tests/integration/Config/UpdaterTest.php +++ b/mailpoet/tests/integration/Config/UpdaterTest.php @@ -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 diff --git a/mailpoet/tests/integration/Cron/CronHelperTest.php b/mailpoet/tests/integration/Cron/CronHelperTest.php index f2fcd39aee..96330fba7b 100644 --- a/mailpoet/tests/integration/Cron/CronHelperTest.php +++ b/mailpoet/tests/integration/Cron/CronHelperTest.php @@ -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() { diff --git a/mailpoet/tests/integration/Cron/DaemonHttpRunnerTest.php b/mailpoet/tests/integration/Cron/DaemonHttpRunnerTest.php index 04b2e28367..6df60d818c 100644 --- a/mailpoet/tests/integration/Cron/DaemonHttpRunnerTest.php +++ b/mailpoet/tests/integration/Cron/DaemonHttpRunnerTest.php @@ -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); } diff --git a/mailpoet/tests/integration/Cron/Workers/SchedulerTest.php b/mailpoet/tests/integration/Cron/Workers/SchedulerTest.php index f68af4f4a9..527d3e5e8e 100644 --- a/mailpoet/tests/integration/Cron/Workers/SchedulerTest.php +++ b/mailpoet/tests/integration/Cron/Workers/SchedulerTest.php @@ -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() { diff --git a/mailpoet/tests/integration/Cron/Workers/SimpleWorkerTest.php b/mailpoet/tests/integration/Cron/Workers/SimpleWorkerTest.php index a8aeee6a59..4b4b464835 100644 --- a/mailpoet/tests/integration/Cron/Workers/SimpleWorkerTest.php +++ b/mailpoet/tests/integration/Cron/Workers/SimpleWorkerTest.php @@ -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); } } diff --git a/mailpoet/tests/integration/Doctrine/ConnectionFactoryTest.php b/mailpoet/tests/integration/Doctrine/ConnectionFactoryTest.php index 5b1c341db2..363f143079 100644 --- a/mailpoet/tests/integration/Doctrine/ConnectionFactoryTest.php +++ b/mailpoet/tests/integration/Doctrine/ConnectionFactoryTest.php @@ -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); diff --git a/mailpoet/tests/integration/Models/SubscriberCustomFieldTest.php b/mailpoet/tests/integration/Models/SubscriberCustomFieldTest.php index 1b05798abe..e3721f59c5 100644 --- a/mailpoet/tests/integration/Models/SubscriberCustomFieldTest.php +++ b/mailpoet/tests/integration/Models/SubscriberCustomFieldTest.php @@ -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(); } diff --git a/mailpoet/tests/integration/Newsletter/Scheduler/AutomaticEmailTest.php b/mailpoet/tests/integration/Newsletter/Scheduler/AutomaticEmailTest.php index 2e7a83f0b4..d1a75220f4 100644 --- a/mailpoet/tests/integration/Newsletter/Scheduler/AutomaticEmailTest.php +++ b/mailpoet/tests/integration/Newsletter/Scheduler/AutomaticEmailTest.php @@ -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); diff --git a/mailpoet/tests/integration/Newsletter/Scheduler/WelcomeTest.php b/mailpoet/tests/integration/Newsletter/Scheduler/WelcomeTest.php index 4266bebe15..f8491ca5b6 100644 --- a/mailpoet/tests/integration/Newsletter/Scheduler/WelcomeTest.php +++ b/mailpoet/tests/integration/Newsletter/Scheduler/WelcomeTest.php @@ -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); diff --git a/mailpoet/tests/integration/Subscription/PagesTest.php b/mailpoet/tests/integration/Subscription/PagesTest.php index a0a304316b..b04554cbd0 100644 --- a/mailpoet/tests/integration/Subscription/PagesTest.php +++ b/mailpoet/tests/integration/Subscription/PagesTest.php @@ -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'); }