From c1c59fe39200eec85e828b8000cb419a7f756ba0 Mon Sep 17 00:00:00 2001
From: Rodrigo Primo <rodrigosprimo@gmail.com>
Date: Wed, 18 Oct 2023 16:54:16 -0300
Subject: [PATCH] Replace expect()->lessOrEquals() with
 verify()->lessThanOrEqual()

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

[MAILPOET-5664]
---
 mailpoet/tests/integration/API/JSON/v1/ImportExportTest.php   | 4 ++--
 .../integration/Cron/Workers/KeyCheck/KeyCheckWorkerTest.php  | 2 +-
 mailpoet/tests/integration/Cron/Workers/SimpleWorkerTest.php  | 2 +-
 mailpoet/tests/integration/Subscription/PagesTest.php         | 4 ++--
 .../tests/integration/Tasks/Subscribers/BatchIteratorTest.php | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/mailpoet/tests/integration/API/JSON/v1/ImportExportTest.php b/mailpoet/tests/integration/API/JSON/v1/ImportExportTest.php
index 9538c645e2..03d85affaa 100644
--- a/mailpoet/tests/integration/API/JSON/v1/ImportExportTest.php
+++ b/mailpoet/tests/integration/API/JSON/v1/ImportExportTest.php
@@ -39,7 +39,7 @@ class ImportExportTest extends \MailPoetTest {
     $now = time();
     $scheduledAt = new Carbon($task->getScheduledAt());
     expect($scheduledAt->timestamp)->greaterOrEquals($now - 1);
-    expect($scheduledAt->timestamp)->lessOrEquals($now + 1);
+    verify($scheduledAt->timestamp)->lessThanOrEqual($now + 1);
   }
 
   public function testItReschedulesScheduledTaskToNow() {
@@ -53,7 +53,7 @@ class ImportExportTest extends \MailPoetTest {
     $now = time();
     $scheduledAt = new Carbon($task->getScheduledAt());
     expect($scheduledAt->timestamp)->greaterOrEquals($now - 1);
-    expect($scheduledAt->timestamp)->lessOrEquals($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/Cron/Workers/KeyCheck/KeyCheckWorkerTest.php b/mailpoet/tests/integration/Cron/Workers/KeyCheck/KeyCheckWorkerTest.php
index f8a307dc86..8197040704 100644
--- a/mailpoet/tests/integration/Cron/Workers/KeyCheck/KeyCheckWorkerTest.php
+++ b/mailpoet/tests/integration/Cron/Workers/KeyCheck/KeyCheckWorkerTest.php
@@ -103,7 +103,7 @@ class KeyCheckWorkerTest extends \MailPoetTest {
     $secondsToMidnight = $dateTime->diffInSeconds($dateTime->copy()->startOfDay()->addDay());
 
     // next run should be planned in 6 hours after midnight
-    expect($nextRunDate->diffInSeconds($dateTime))->lessOrEquals(21600 + $secondsToMidnight);
+    verify($nextRunDate->diffInSeconds($dateTime))->lessThanOrEqual(21600 + $secondsToMidnight);
   }
 
   private function createRunningTask(Carbon $scheduledAt = null) {
diff --git a/mailpoet/tests/integration/Cron/Workers/SimpleWorkerTest.php b/mailpoet/tests/integration/Cron/Workers/SimpleWorkerTest.php
index c2b591fe95..a8aeee6a59 100644
--- a/mailpoet/tests/integration/Cron/Workers/SimpleWorkerTest.php
+++ b/mailpoet/tests/integration/Cron/Workers/SimpleWorkerTest.php
@@ -63,7 +63,7 @@ class SimpleWorkerTest extends \MailPoetTest {
     $difference = $nextRunDate->diffInDays($currentDate);
     // Subtract days left in the current week
     $difference -= (Carbon::DAYS_PER_WEEK - (int)$currentDate->format('N'));
-    expect($difference)->lessOrEquals(7);
+    verify($difference)->lessThanOrEqual(7);
     expect($difference)->greaterOrEquals(0);
   }
 }
diff --git a/mailpoet/tests/integration/Subscription/PagesTest.php b/mailpoet/tests/integration/Subscription/PagesTest.php
index afdc0bb1d8..a0a304316b 100644
--- a/mailpoet/tests/integration/Subscription/PagesTest.php
+++ b/mailpoet/tests/integration/Subscription/PagesTest.php
@@ -152,9 +152,9 @@ class PagesTest extends \MailPoetTest {
     $this->assertInstanceOf(SubscriberEntity::class, $confirmedSubscriber);
     verify($confirmedSubscriber->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
     expect($confirmedSubscriber->getConfirmedAt())->greaterOrEquals(Carbon::createFromTimestamp($this->wp->currentTime('timestamp'))->subSecond());
-    expect($confirmedSubscriber->getConfirmedAt())->lessOrEquals(Carbon::createFromTimestamp($this->wp->currentTime('timestamp'))->addSecond());
+    verify($confirmedSubscriber->getConfirmedAt())->lessThanOrEqual(Carbon::createFromTimestamp($this->wp->currentTime('timestamp'))->addSecond());
     expect($confirmedSubscriber->getLastSubscribedAt())->greaterOrEquals(Carbon::createFromTimestamp($this->wp->currentTime('timestamp'))->subSecond());
-    expect($confirmedSubscriber->getLastSubscribedAt())->lessOrEquals(Carbon::createFromTimestamp($this->wp->currentTime('timestamp'))->addSecond());
+    verify($confirmedSubscriber->getLastSubscribedAt())->lessThanOrEqual(Carbon::createFromTimestamp($this->wp->currentTime('timestamp'))->addSecond());
     verify($confirmedSubscriber->getFirstName())->equals('First name');
   }
 
diff --git a/mailpoet/tests/integration/Tasks/Subscribers/BatchIteratorTest.php b/mailpoet/tests/integration/Tasks/Subscribers/BatchIteratorTest.php
index 246fd23ab0..0a50047af8 100644
--- a/mailpoet/tests/integration/Tasks/Subscribers/BatchIteratorTest.php
+++ b/mailpoet/tests/integration/Tasks/Subscribers/BatchIteratorTest.php
@@ -57,7 +57,7 @@ class BatchIteratorTest extends \MailPoetTest {
       if ($i < $iterations) {
         verify(count($batch))->equals($this->batchSize);
       } else {
-        expect(count($batch))->lessOrEquals($this->batchSize);
+        verify(count($batch))->lessThanOrEqual($this->batchSize);
       }
     }
     verify($i)->equals($iterations);