From 75f7ea24a952d788c0c68ede39acfc78f06df37d Mon Sep 17 00:00:00 2001 From: Rodrigo Primo Date: Tue, 21 Nov 2023 15:59:08 -0300 Subject: [PATCH] Rename createQueueWithTaskAndSegment() to createQueueWithTask() Removed `AndSegment` from test helper method to better reflect what it does as it does not create a segment. [MAILPOET-5682] --- .../Cron/Workers/SendingQueue/SendingQueueTest.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mailpoet/tests/integration/Cron/Workers/SendingQueue/SendingQueueTest.php b/mailpoet/tests/integration/Cron/Workers/SendingQueue/SendingQueueTest.php index 93bc062e3a..220508d9e4 100644 --- a/mailpoet/tests/integration/Cron/Workers/SendingQueue/SendingQueueTest.php +++ b/mailpoet/tests/integration/Cron/Workers/SendingQueue/SendingQueueTest.php @@ -1269,7 +1269,7 @@ class SendingQueueTest extends \MailPoetTest { public function testItPauseSendingTaskThatHasTrashedSegment() { $newsletter = $this->createNewsletter(NewsletterEntity::TYPE_STANDARD, 'Subject With Trashed', NewsletterEntity::STATUS_SENDING); - $queue = $this->createQueueWithTaskAndSegment($newsletter, null, ['html' => 'Hello', 'text' => 'Hello']); + $queue = $this->createQueueWithTask($newsletter, null, ['html' => 'Hello', 'text' => 'Hello']); $segment = $this->createSegment('Segment test', SegmentEntity::TYPE_DEFAULT); $segment->setDeletedAt(new \DateTime()); $this->entityManager->flush(); @@ -1289,7 +1289,7 @@ class SendingQueueTest extends \MailPoetTest { public function testItPauseSendingTaskThatHasDeletedSegment() { $newsletter = $this->createNewsletter(NewsletterEntity::TYPE_STANDARD, 'Subject With Deleted', NewsletterEntity::STATUS_SENDING); - $queue = $this->createQueueWithTaskAndSegment($newsletter, null, ['html' => 'Hello', 'text' => 'Hello']); + $queue = $this->createQueueWithTask($newsletter, null, ['html' => 'Hello', 'text' => 'Hello']); $segment = $this->createSegment('Segment test', SegmentEntity::TYPE_DEFAULT); $this->addSegmentToNewsletter($newsletter, $segment); $this->entityManager->createQueryBuilder()->delete(SegmentEntity::class, 's') @@ -1395,7 +1395,7 @@ class SendingQueueTest extends \MailPoetTest { $newsletter = $this->createNewsletter(NewsletterEntity::TYPE_STANDARD, 'Subject With Deleted', NewsletterEntity::STATUS_SENDING); [$segment, $subscriber] = $this->createListWithSubscriber(); $this->addSegmentToNewsletter($newsletter, $segment); - $queue = $this->createQueueWithTaskAndSegment($newsletter, null, ['html' => 'Hello', 'text' => 'Hello']); + $queue = $this->createQueueWithTask($newsletter, null, ['html' => 'Hello', 'text' => 'Hello']); $subscriber->setStatus(SubscriberEntity::STATUS_UNSUBSCRIBED); $this->entityManager->persist($subscriber); $this->entityManager->flush(); @@ -1447,7 +1447,7 @@ class SendingQueueTest extends \MailPoetTest { $this->entityManager->flush(); } - private function createQueueWithTaskAndSegment(NewsletterEntity $newsletter, $status = null, $body = null): SendingQueueEntity { + private function createQueueWithTask(NewsletterEntity $newsletter, $status = null, $body = null): SendingQueueEntity { $task = new ScheduledTaskEntity(); $task->setType(SendingQueueWorker::TASK_TYPE); $task->setStatus($status);