diff --git a/mailpoet/tests/integration/Cron/Workers/SendingQueue/SendingQueueTest.php b/mailpoet/tests/integration/Cron/Workers/SendingQueue/SendingQueueTest.php index 4d5d0980ba..782dc9bc88 100644 --- a/mailpoet/tests/integration/Cron/Workers/SendingQueue/SendingQueueTest.php +++ b/mailpoet/tests/integration/Cron/Workers/SendingQueue/SendingQueueTest.php @@ -19,6 +19,7 @@ use MailPoet\Entities\NewsletterEntity; use MailPoet\Entities\NewsletterLinkEntity; use MailPoet\Entities\NewsletterSegmentEntity; use MailPoet\Entities\ScheduledTaskEntity; +use MailPoet\Entities\ScheduledTaskSubscriberEntity; use MailPoet\Entities\SegmentEntity; use MailPoet\Entities\SendingQueueEntity; use MailPoet\Entities\SubscriberEntity; @@ -30,7 +31,6 @@ use MailPoet\Mailer\SubscriberError; use MailPoet\Models\Newsletter; use MailPoet\Models\NewsletterSegment; use MailPoet\Models\ScheduledTask; -use MailPoet\Models\ScheduledTaskSubscriber; use MailPoet\Models\Segment; use MailPoet\Models\SendingQueue; use MailPoet\Models\StatisticsNewsletters; @@ -476,9 +476,9 @@ class SendingQueueTest extends \MailPoetTest { verify($scheduledTask->getStatus())->equals(SendingQueue::STATUS_COMPLETED); // queue subscriber processed/to process count is updated - verify($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriber::STATUS_UNPROCESSED)) + verify($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriberEntity::STATUS_UNPROCESSED)) ->arrayCount(0); - $processedSubscribers = $scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriber::STATUS_PROCESSED); + $processedSubscribers = $scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriberEntity::STATUS_PROCESSED); verify($processedSubscribers)->equals([$this->subscriber]); verify($sendingQueue->getCountTotal())->equals(1); verify($sendingQueue->getCountProcessed())->equals(1); @@ -610,9 +610,9 @@ class SendingQueueTest extends \MailPoetTest { verify($scheduledTask->getStatus())->equals(SendingQueue::STATUS_COMPLETED); // queue subscriber processed/to process count is updated - verify($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriber::STATUS_UNPROCESSED)) + verify($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriberEntity::STATUS_UNPROCESSED)) ->arrayCount(0); - $processedSubscribers = $scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriber::STATUS_PROCESSED); + $processedSubscribers = $scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriberEntity::STATUS_PROCESSED); verify($processedSubscribers)->equals([$this->subscriber]); verify($sendingQueue->getCountTotal())->equals(1); verify($sendingQueue->getCountProcessed())->equals(1); @@ -659,9 +659,9 @@ class SendingQueueTest extends \MailPoetTest { verify($updatedNewsletter->getSentAt())->equalsWithDelta($scheduledTask->getProcessedAt(), 1); // queue subscriber processed/to process count is updated - verify($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriber::STATUS_UNPROCESSED)) + verify($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriberEntity::STATUS_UNPROCESSED)) ->arrayCount(0); - $processedSubscribers = $scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriber::STATUS_PROCESSED); + $processedSubscribers = $scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriberEntity::STATUS_PROCESSED); verify($processedSubscribers)->equals([$this->subscriber]); verify($sendingQueue->getCountTotal())->equals(1); verify($sendingQueue->getCountProcessed())->equals(1); @@ -737,8 +737,8 @@ class SendingQueueTest extends \MailPoetTest { // compare data after first sending $this->sendingQueuesRepository->refresh($sendingQueue); $this->scheduledTasksRepository->refresh($scheduledTask); - verify($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriber::STATUS_UNPROCESSED))->equals([$this->subscriber]); - verify($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriber::STATUS_PROCESSED))->equals([$wrongSubscriber]); + verify($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriberEntity::STATUS_UNPROCESSED))->equals([$this->subscriber]); + verify($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriberEntity::STATUS_PROCESSED))->equals([$wrongSubscriber]); verify($sendingQueue->getCountTotal())->equals(2); verify($sendingQueue->getCountProcessed())->equals(1); verify($sendingQueue->getCountToProcess())->equals(1); @@ -755,8 +755,8 @@ class SendingQueueTest extends \MailPoetTest { // load queue and compare data after second sending $this->sendingQueuesRepository->refresh($sendingQueue); $this->scheduledTasksRepository->refresh($scheduledTask); - verify($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriber::STATUS_UNPROCESSED))->equals([]); - verify($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriber::STATUS_PROCESSED))->equals([$this->subscriber, $wrongSubscriber]); + verify($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriberEntity::STATUS_UNPROCESSED))->equals([]); + verify($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriberEntity::STATUS_PROCESSED))->equals([$this->subscriber, $wrongSubscriber]); verify($sendingQueue->getCountTotal())->equals(2); verify($sendingQueue->getCountProcessed())->equals(2); verify($sendingQueue->getCountToProcess())->equals(0); @@ -818,9 +818,9 @@ class SendingQueueTest extends \MailPoetTest { verify($scheduledTask->getStatus())->equals(SendingQueue::STATUS_COMPLETED); // queue subscriber processed/to process count is updated - verify($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriber::STATUS_UNPROCESSED)) + verify($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriberEntity::STATUS_UNPROCESSED)) ->equals([]); - verify($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriber::STATUS_PROCESSED)) + verify($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriberEntity::STATUS_PROCESSED)) ->equals([$this->subscriber]); verify($sendingQueue->getCountTotal())->equals(1); verify($sendingQueue->getCountProcessed())->equals(1); @@ -860,7 +860,7 @@ class SendingQueueTest extends \MailPoetTest { $this->sendingQueuesRepository->refresh($sendingQueue); $this->scheduledTasksRepository->refresh($scheduledTask); - verify($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriber::STATUS_PROCESSED)) + verify($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriberEntity::STATUS_PROCESSED)) ->equals([]); verify($sendingQueue->getCountTotal())->equals(0); verify($sendingQueue->getCountProcessed())->equals(0); @@ -899,7 +899,7 @@ class SendingQueueTest extends \MailPoetTest { $this->scheduledTasksRepository->refresh($scheduledTask); // Unprocessable subscribers were removed - verify($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriber::STATUS_PROCESSED)) + verify($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriberEntity::STATUS_PROCESSED)) ->equals([$this->subscriber]); // subscriber that should be processed verify($sendingQueue->getCountTotal())->equals(1); verify($sendingQueue->getCountProcessed())->equals(1); @@ -934,9 +934,9 @@ class SendingQueueTest extends \MailPoetTest { $this->sendingQueuesRepository->refresh($sendingQueue); $this->scheduledTasksRepository->refresh($scheduledTask); // queue subscriber processed/to process count is updated - verify($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriber::STATUS_UNPROCESSED)) + verify($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriberEntity::STATUS_UNPROCESSED)) ->equals([]); - verify($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriber::STATUS_PROCESSED)) + verify($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriberEntity::STATUS_PROCESSED)) ->equals([$this->subscriber]); verify($sendingQueue->getCountTotal())->equals(1); verify($sendingQueue->getCountProcessed())->equals(1); @@ -977,9 +977,9 @@ class SendingQueueTest extends \MailPoetTest { $this->sendingQueuesRepository->refresh($sendingQueue); $this->scheduledTasksRepository->refresh($scheduledTask); // queue subscriber processed/to process count is updated - verify($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriber::STATUS_UNPROCESSED)) + verify($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriberEntity::STATUS_UNPROCESSED)) ->equals([]); - verify($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriber::STATUS_PROCESSED)) + verify($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriberEntity::STATUS_PROCESSED)) ->equals([$this->subscriber]); verify($sendingQueue->getCountTotal())->equals(1); verify($sendingQueue->getCountProcessed())->equals(1); @@ -1010,9 +1010,9 @@ class SendingQueueTest extends \MailPoetTest { $this->sendingQueuesRepository->refresh($sendingQueue); $this->scheduledTasksRepository->refresh($scheduledTask); // queue subscriber processed/to process count is updated - verify($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriber::STATUS_UNPROCESSED)) + verify($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriberEntity::STATUS_UNPROCESSED)) ->equals([]); - verify($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriber::STATUS_PROCESSED)) + verify($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriberEntity::STATUS_PROCESSED)) ->equals([]); verify($sendingQueue->getCountTotal())->equals(0); verify($sendingQueue->getCountProcessed())->equals(0);