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

Remove simple usages of MailPoet\Tasks\Sending from integration tests

Browse Source 
[MAILPOET-4375]
This commit is contained in:
Jan Jakes
2023-10-24 16:31:38 +02:00
committed by Aschepikov
parent b2679bface
commit bb29f25c40
25 changed files with 61 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mailpoet/tests/DataGenerator/Generators/WooCommercePastRevenues.php
View File

@ -2,6 +2,7 @@
namespace MailPoet\Test\DataGenerator\Generators;
use MailPoet\Cron\Workers\SendingQueue\SendingQueue;
use MailPoet\DI\ContainerWrapper;
use MailPoet\Entities\NewsletterEntity;
use MailPoet\Entities\NewsletterLinkEntity;
@ -20,7 +21,6 @@ use MailPoet\Newsletter\Segment\NewsletterSegmentRepository;
use MailPoet\Newsletter\Sending\ScheduledTasksRepository;
use MailPoet\Newsletter\Sending\SendingQueuesRepository;
use MailPoet\Segments\SegmentsRepository;
use MailPoet\Tasks\Sending;
use MailPoet\Test\DataFactories\Newsletter;
use MailPoet\Test\DataFactories\Segment;
use MailPoet\Test\DataFactories\Subscriber as SubscriberFactory;
@ -387,7 +387,7 @@ class WooCommercePastRevenues implements Generator {
// Sending task
$task = new ScheduledTaskEntity();
$task->setType(Sending::TASK_TYPE);
$task->setType(SendingQueue::TASK_TYPE);
$task->setStatus(ScheduledTaskEntity::STATUS_COMPLETED);
$task->setCreatedAt(new Carbon($sentAt));
$task->setProcessedAt(new Carbon($sentAt));

4
mailpoet/tests/integration/API/JSON/ResponseBuilders/SendingQueuesResponseBuilderTest.php
View File

@ -3,10 +3,10 @@
namespace integration\API\JSON\ResponseBuilders;
use MailPoet\API\JSON\ResponseBuilders\SendingQueuesResponseBuilder;
use MailPoet\Cron\Workers\SendingQueue\SendingQueue;
use MailPoet\Entities\NewsletterEntity;
use MailPoet\Entities\ScheduledTaskEntity;
use MailPoet\Entities\SendingQueueEntity;
use MailPoet\Tasks\Sending;
use MailPoet\Test\DataFactories\Newsletter as NewsletterFactory;
use MailPoet\Test\DataFactories\ScheduledTask as ScheduledTaskFactory;
use MailPoet\Test\DataFactories\SendingQueue as SendingQueueFactory;
@ -33,7 +33,7 @@ class SendingQueuesResponseBuilderTest extends \MailPoetTest {
$this->sendingQueuesResponseBuilder = $this->diContainer->get(SendingQueuesResponseBuilder::class);
$scheduledAt = new Carbon('2018-10-10 10:00:00');
$this->newsletter = $newsletterFactory->create();
$this->scheduledTask = $scheduledTaskFactory->create(Sending::TASK_TYPE, ScheduledTaskEntity::STATUS_SCHEDULED, $scheduledAt);
$this->scheduledTask = $scheduledTaskFactory->create(SendingQueue::TASK_TYPE, ScheduledTaskEntity::STATUS_SCHEDULED, $scheduledAt);
$this->sendingQueue = $sendingQueueFactory->create($this->scheduledTask, $this->newsletter);
$this->assertInstanceOf(SendingQueueEntity::class, $this->sendingQueue);
}

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

@ -5,12 +5,12 @@ namespace MailPoet\Test\API\JSON\v1;
use Codeception\Util\Stub;
use MailPoet\API\JSON\Response as APIResponse;
use MailPoet\API\JSON\v1\SendingQueue as SendingQueueAPI;
use MailPoet\Cron\Workers\SendingQueue\SendingQueue;
use MailPoet\Entities\NewsletterEntity;
use MailPoet\Entities\ScheduledTaskEntity;
use MailPoet\Newsletter\NewsletterValidator;
use MailPoet\Newsletter\Sending\ScheduledTasksRepository;
use MailPoet\Settings\SettingsController;
use MailPoet\Tasks\Sending;
use MailPoet\Test\DataFactories\Newsletter;
use MailPoet\Test\DataFactories\NewsletterOption;
use MailPoet\Util\License\Features\Subscribers as SubscribersFeature;
@ -57,7 +57,7 @@ class SendingQueueTest extends \MailPoetTest {
$scheduled = $scheduledTask->getScheduledAt();
$this->assertInstanceOf(\DateTimeInterface::class, $scheduled);
verify($scheduled->format('Y-m-d H:i:s'))->equals($newsletterOptions['scheduledAt']);
verify($scheduledTask->getType())->equals(Sending::TASK_TYPE);
verify($scheduledTask->getType())->equals(SendingQueue::TASK_TYPE);
}
public function testItReturnsErrorIfSubscribersLimitReached() {

6
mailpoet/tests/integration/AdminPages/HelpTest.php
View File

@ -5,6 +5,7 @@ namespace integration\AdminPages;
use MailPoet\AdminPages\PageRenderer;
use MailPoet\AdminPages\Pages\Help;
use MailPoet\Cron\CronHelper;
use MailPoet\Cron\Workers\SendingQueue\SendingQueue;
use MailPoet\Entities\NewsletterEntity;
use MailPoet\Entities\ScheduledTaskEntity;
use MailPoet\Entities\SendingQueueEntity;
@ -13,7 +14,6 @@ use MailPoet\Newsletter\Sending\SendingQueuesRepository;
use MailPoet\Newsletter\Url;
use MailPoet\Services\Bridge;
use MailPoet\SystemReport\SystemReportCollector;
use MailPoet\Tasks\Sending;
use MailPoet\Test\DataFactories\Newsletter;
use MailPoet\Test\DataFactories\ScheduledTask as ScheduledTaskFactory;
use MailPoetVendor\Carbon\Carbon;
@ -49,7 +49,7 @@ class HelpTest extends \MailPoetTest {
public function testItFetchesNewsletterDataForSendingTasks() {
$task = $this->scheduledTaskFactory->create(
Sending::TASK_TYPE,
SendingQueue::TASK_TYPE,
ScheduledTaskEntity::STATUS_SCHEDULED,
Carbon::now()->addDay()
);
@ -66,7 +66,7 @@ class HelpTest extends \MailPoetTest {
public function testItDoesNotFailForSendingTaskWithMissingNewsletterInconsistentData() {
$task = $this->scheduledTaskFactory->create(
Sending::TASK_TYPE,
SendingQueue::TASK_TYPE,
ScheduledTaskEntity::STATUS_SCHEDULED,
Carbon::now()->addDay()
);

4
mailpoet/tests/integration/Analytics/UnsubscribeAnalyticsTest.php
View File

@ -3,8 +3,8 @@
namespace integration\Analytics;
use MailPoet\Analytics\UnsubscribeReporter;
use MailPoet\Cron\Workers\SendingQueue\SendingQueue as SendingQueueWorker;
use MailPoet\Entities\StatisticsUnsubscribeEntity;
use MailPoet\Tasks\Sending;
use MailPoet\Test\DataFactories\Newsletter;
use MailPoet\Test\DataFactories\ScheduledTask;
use MailPoet\Test\DataFactories\SendingQueue;
@ -47,7 +47,7 @@ class UnsubscribeAnalyticsTest extends \MailPoetTest {
private function createStatisticsUnsubscribe(\DateTimeInterface $createdAt, $method): StatisticsUnsubscribeEntity {
$subscriber = (new Subscriber())->create();
$newsletter = (new Newsletter())->create();
$task = (new ScheduledTask())->create(Sending::TASK_TYPE, null, (new Carbon())->subMonths(random_int(0, 12)));
$task = (new ScheduledTask())->create(SendingQueueWorker::TASK_TYPE, null, (new Carbon())->subMonths(random_int(0, 12)));
$queue = (new SendingQueue())->create($task);
$entity = new StatisticsUnsubscribeEntity($newsletter, $queue, $subscriber);

4
mailpoet/tests/integration/AutomaticEmails/WooCommerce/Events/AbandonedCartTest.php
View File

@ -3,6 +3,7 @@
namespace MailPoet\AutomaticEmails\WooCommerce\Events;
use MailPoet\AutomaticEmails\WooCommerce\WooCommerce as WooCommerceEmail;
use MailPoet\Cron\Workers\SendingQueue\SendingQueue;
use MailPoet\Entities\NewsletterEntity;
use MailPoet\Entities\ScheduledTaskEntity;
use MailPoet\Entities\ScheduledTaskSubscriberEntity;
@ -17,7 +18,6 @@ use MailPoet\Settings\TrackingConfig;
use MailPoet\Statistics\Track\SubscriberActivityTracker;
use MailPoet\Statistics\Track\SubscriberCookie;
use MailPoet\Subscribers\SubscribersRepository;
use MailPoet\Tasks\Sending as SendingTask;
use MailPoet\Test\DataFactories\Newsletter as NewsletterFactory;
use MailPoet\Test\DataFactories\NewsletterOption as NewsletterOptionFactory;
use MailPoet\Test\DataFactories\Subscriber as SubscriberFactory;
@ -326,7 +326,7 @@ class AbandonedCartTest extends \MailPoetTest {
private function createSendingTask(NewsletterEntity $newsletter, SubscriberEntity $subscriber, Carbon $scheduleAt): ScheduledTaskEntity {
$scheduledTask = new ScheduledTaskEntity();
$scheduledTask->setType(SendingTask::TASK_TYPE);
$scheduledTask->setType(SendingQueue::TASK_TYPE);
$this->entityManager->persist($scheduledTask);
$this->entityManager->flush();

6
mailpoet/tests/integration/AutomaticEmails/WooCommerce/Events/FirstPurchaseTest.php
View File

@ -6,6 +6,7 @@ use Codeception\Stub;
use Codeception\Stub\Expected;
use MailPoet\AutomaticEmails\WooCommerce\WooCommerce;
use MailPoet\AutomaticEmails\WooCommerce\WooCommerceStubs\OrderDetails;
use MailPoet\Cron\Workers\SendingQueue\SendingQueue;
use MailPoet\Entities\NewsletterEntity;
use MailPoet\Entities\ScheduledTaskEntity;
use MailPoet\Entities\SendingQueueEntity;
@ -14,7 +15,6 @@ use MailPoet\Entities\SubscriberSegmentEntity;
use MailPoet\Newsletter\Sending\ScheduledTasksRepository;
use MailPoet\Newsletter\Sending\SendingQueuesRepository;
use MailPoet\Segments\SegmentsRepository;
use MailPoet\Tasks\Sending;
use MailPoet\Test\DataFactories\Newsletter as NewsletterFactory;
use MailPoet\Test\DataFactories\NewsletterOption as NewsletterOptionFactory;
use MailPoet\Test\DataFactories\Subscriber as SubscriberFactory;
@ -266,9 +266,9 @@ class FirstPurchaseTest extends \MailPoetTest {
WPFunctions::get()->removeAllFilters('woocommerce_order_status_processing');
WPFunctions::get()->removeAllFilters('woocommerce_order_status_completed');
$orderId = $this->_runTestItSchedulesEmailForState('processing');
$tasksCountBeforeStatusChange = count($this->scheduledTasksRepository->findBy(['type' => Sending::TASK_TYPE]));
$tasksCountBeforeStatusChange = count($this->scheduledTasksRepository->findBy(['type' => SendingQueue::TASK_TYPE]));
WPFunctions::get()->doAction('woocommerce_order_status_completed', $orderId);
$tasksCountAfterStatusChange = count($this->scheduledTasksRepository->findBy(['type' => Sending::TASK_TYPE]));
$tasksCountAfterStatusChange = count($this->scheduledTasksRepository->findBy(['type' => SendingQueue::TASK_TYPE]));
verify($tasksCountAfterStatusChange)->equals($tasksCountBeforeStatusChange);
}

4
mailpoet/tests/integration/Cron/Triggers/WordPressTest.php
View File

@ -9,6 +9,7 @@ use MailPoet\Cron\Workers\Bounce as BounceWorker;
use MailPoet\Cron\Workers\InactiveSubscribers;
use MailPoet\Cron\Workers\NewsletterTemplateThumbnails;
use MailPoet\Cron\Workers\ReEngagementEmailsScheduler;
use MailPoet\Cron\Workers\SendingQueue\SendingQueue;
use MailPoet\Cron\Workers\StatsNotifications\AutomatedEmails;
use MailPoet\Cron\Workers\StatsNotifications\Worker as StatsNotificationsWorker;
use MailPoet\Cron\Workers\SubscriberLinkTokens;
@ -26,7 +27,6 @@ use MailPoet\Mailer\Mailer;
use MailPoet\Mailer\MailerLog;
use MailPoet\Services\Bridge;
use MailPoet\Settings\SettingsController;
use MailPoet\Tasks\Sending;
use MailPoet\Test\DataFactories\Newsletter as NewsletterFactory;
use MailPoet\Test\DataFactories\ScheduledTask as ScheduledTaskFactory;
use MailPoet\Test\DataFactories\SendingQueue as SendingQueueFactory;
@ -325,7 +325,7 @@ class WordPressTest extends \MailPoetTest {
Carbon::createFromTimestamp(WPFunctions::get()->currentTime('timestamp')) :
null;
$newsletter = (new NewsletterFactory())->create();
$scheduledTask = (new ScheduledTaskFactory())->create(Sending::TASK_TYPE, $status, $scheduledAt);
$scheduledTask = (new ScheduledTaskFactory())->create(SendingQueue::TASK_TYPE, $status, $scheduledAt);
$sendingQueue = (new SendingQueueFactory())->create($scheduledTask, $newsletter);
return $sendingQueue;
}

2
mailpoet/tests/integration/Cron/Workers/SendingQueue/SendingQueueTest.php
View File

@ -1401,7 +1401,7 @@ class SendingQueueTest extends \MailPoetTest {
private function createQueueWithTaskAndSegment(NewsletterEntity $newsletter, $status = null, $body = null): SendingQueueEntity {
$task = new ScheduledTaskEntity();
$task->setType(SendingTask::TASK_TYPE);
$task->setType(SendingQueueWorker::TASK_TYPE);
$task->setStatus($status);
$this->entityManager->persist($task);

4
mailpoet/tests/integration/Cron/Workers/StatsNotifications/NewsletterLinkRepositoryTest.php
View File

@ -2,13 +2,13 @@
namespace MailPoet\Cron\Workers\StatsNotifications;
use MailPoet\Cron\Workers\SendingQueue\SendingQueue;
use MailPoet\Entities\NewsletterEntity;
use MailPoet\Entities\NewsletterLinkEntity;
use MailPoet\Entities\ScheduledTaskEntity;
use MailPoet\Entities\SendingQueueEntity;
use MailPoet\Entities\StatisticsClickEntity;
use MailPoet\Entities\SubscriberEntity;
use MailPoet\Tasks\Sending as SendingTask;
class NewsletterLinkRepositoryTest extends \MailPoetTest {
public function testItFetchesTopLink() {
@ -19,7 +19,7 @@ class NewsletterLinkRepositoryTest extends \MailPoetTest {
$this->entityManager->persist($newsletter);
$task = new ScheduledTaskEntity();
$task->setType(SendingTask::TASK_TYPE);
$task->setType(SendingQueue::TASK_TYPE);
$task->setStatus(ScheduledTaskEntity::STATUS_COMPLETED);
$this->entityManager->persist($task);

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

@ -2,6 +2,7 @@
namespace MailPoet\Cron\Workers;
use MailPoet\Cron\Workers\SendingQueue\SendingQueue;
use MailPoet\Entities\NewsletterEntity;
use MailPoet\Entities\ScheduledTaskEntity;
use MailPoet\Entities\ScheduledTaskSubscriberEntity;
@ -11,7 +12,6 @@ use MailPoet\Newsletter\Sending\ScheduledTasksRepository;
use MailPoet\Settings\SettingsController;
use MailPoet\Settings\TrackingConfig;
use MailPoet\Subscribers\SubscribersRepository;
use MailPoet\Tasks\Sending;
use MailPoet\Test\DataFactories\ScheduledTask as ScheduledTaskFactory;
use MailPoet\WP\Functions as WPFunctions;
use MailPoetVendor\Carbon\Carbon;
@ -186,7 +186,7 @@ class SubscribersLifetimeEmailCountTest extends \MailPoetTest {
private function createCompletedSendingTask(int $processedDaysAgo = 0): array {
$processedAt = (new Carbon())->subDays($processedDaysAgo)->addHours(2);
$task = new ScheduledTaskEntity();
$task->setType(Sending::TASK_TYPE);
$task->setType(SendingQueue::TASK_TYPE);
$task->setStatus(ScheduledTaskEntity::STATUS_COMPLETED);
$task->setCreatedAt($processedAt);
$task->setProcessedAt($processedAt);

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

@ -5,6 +5,7 @@ namespace MailPoet\Test\Cron\Workers;
use Codeception\Util\Stub;
use DateTime;
use MailPoet\Cron\CronWorkerRunner;
use MailPoet\Cron\Workers\SendingQueue\SendingQueue;
use MailPoet\Cron\Workers\WooCommercePastOrders;
use MailPoet\Entities\NewsletterEntity;
use MailPoet\Entities\NewsletterLinkEntity;
@ -15,7 +16,6 @@ use MailPoet\Entities\SubscriberEntity;
use MailPoet\Newsletter\Sending\ScheduledTasksRepository;
use MailPoet\Statistics\StatisticsClicksRepository;
use MailPoet\Statistics\Track\WooCommercePurchases;
use MailPoet\Tasks\Sending as SendingTask;
use MailPoet\WooCommerce\Helper as WooCommerceHelper;
use PHPUnit\Framework\MockObject\MockObject;
@ -155,7 +155,7 @@ class WooCommerceOrdersTest extends \MailPoetTest {
$this->entityManager->persist($newsletter);
$task = new ScheduledTaskEntity();
$task->setType(SendingTask::TASK_TYPE);
$task->setType(SendingQueue::TASK_TYPE);
$task->setStatus(ScheduledTaskEntity::STATUS_COMPLETED);
$this->entityManager->persist($task);

8
mailpoet/tests/integration/Entities/NewsletterEntityTest.php
View File

@ -2,11 +2,11 @@
namespace MailPoet\Entities;
use MailPoet\Cron\Workers\SendingQueue\SendingQueue;
use MailPoet\Newsletter\NewslettersRepository;
use MailPoet\Newsletter\Options\NewsletterOptionsRepository;
use MailPoet\Newsletter\Segment\NewsletterSegmentRepository;
use MailPoet\Segments\SegmentsRepository;
use MailPoet\Tasks\Sending as SendingTask;
use MailPoet\Test\DataFactories\NewsletterOptionField;
class NewsletterEntityTest extends \MailPoetTest {
@ -85,7 +85,7 @@ class NewsletterEntityTest extends \MailPoetTest {
$newsletter->setType(NewsletterEntity::TYPE_WELCOME);
$newsletter->setStatus(NewsletterEntity::STATUS_SCHEDULED);
$task = new ScheduledTaskEntity();
$task->setType(SendingTask::TASK_TYPE);
$task->setType(SendingQueue::TASK_TYPE);
$task->setStatus(ScheduledTaskEntity::STATUS_SCHEDULED);
$this->entityManager->persist($task);
@ -111,7 +111,7 @@ class NewsletterEntityTest extends \MailPoetTest {
$newsletter->setType(NewsletterEntity::TYPE_WELCOME);
$newsletter->setStatus(NewsletterEntity::STATUS_DRAFT);
$task = new ScheduledTaskEntity();
$task->setType(SendingTask::TASK_TYPE);
$task->setType(SendingQueue::TASK_TYPE);
$task->setStatus(ScheduledTaskEntity::STATUS_PAUSED);
$this->entityManager->persist($task);
@ -137,7 +137,7 @@ class NewsletterEntityTest extends \MailPoetTest {
$newsletter->setType(NewsletterEntity::TYPE_WELCOME);
$newsletter->setStatus(NewsletterEntity::STATUS_DRAFT);
$task = new ScheduledTaskEntity();
$task->setType(SendingTask::TASK_TYPE);
$task->setType(SendingQueue::TASK_TYPE);
$task->setScheduledAt(new \DateTimeImmutable('2012-01-02 12:23:34'));
$task->setStatus(ScheduledTaskEntity::STATUS_PAUSED);
$this->entityManager->persist($task);

3
mailpoet/tests/integration/Newsletter/NewsletterRepositoryTest.php
View File

@ -3,6 +3,7 @@
namespace MailPoet\Newsletter;
use Codeception\Util\Fixtures;
use MailPoet\Cron\Workers\SendingQueue\SendingQueue;
use MailPoet\Entities\NewsletterEntity;
use MailPoet\Entities\NewsletterLinkEntity;
use MailPoet\Entities\NewsletterOptionEntity;
@ -355,7 +356,7 @@ class NewsletterRepositoryTest extends \MailPoetTest {
private function createQueueWithTaskAndSegmentAndSubscribers(NewsletterEntity $newsletter, $status = ScheduledTaskEntity::STATUS_SCHEDULED): SendingQueueEntity {
$task = new ScheduledTaskEntity();
$task->setType(SendingTask::TASK_TYPE);
$task->setType(SendingQueue::TASK_TYPE);
$task->setStatus($status);
$this->entityManager->persist($task);

4
mailpoet/tests/integration/Newsletter/NewsletterSaveControllerTest.php
View File

@ -3,6 +3,7 @@
namespace MailPoet\Newsletter;
use Codeception\Util\Fixtures;
use MailPoet\Cron\Workers\SendingQueue\SendingQueue;
use MailPoet\Entities\NewsletterEntity;
use MailPoet\Entities\NewsletterOptionEntity;
use MailPoet\Entities\NewsletterSegmentEntity;
@ -13,7 +14,6 @@ use MailPoet\Newsletter\Scheduler\PostNotificationScheduler;
use MailPoet\Newsletter\Scheduler\Scheduler;
use MailPoet\Newsletter\Sending\SendingQueuesRepository;
use MailPoet\Settings\SettingsController;
use MailPoet\Tasks\Sending as SendingTask;
use MailPoet\Test\DataFactories\NewsletterOptionField;
use MailPoet\WP\Functions as WPFunctions;
use MailPoetVendor\Carbon\Carbon;
@ -376,7 +376,7 @@ class NewsletterSaveControllerTest extends \MailPoetTest {
private function createQueueWithTask(NewsletterEntity $newsletter): SendingQueueEntity {
$task = new ScheduledTaskEntity();
$task->setType(SendingTask::TASK_TYPE);
$task->setType(SendingQueue::TASK_TYPE);
$task->setStatus(ScheduledTaskEntity::STATUS_SCHEDULED);
$this->entityManager->persist($task);

4
mailpoet/tests/integration/Newsletter/Scheduler/ReEngagementSchedulerTest.php
View File

@ -2,6 +2,7 @@
namespace MailPoet\Newsletter\Scheduler;
use MailPoet\Cron\Workers\SendingQueue\SendingQueue;
use MailPoet\Entities\NewsletterEntity;
use MailPoet\Entities\NewsletterOptionEntity;
use MailPoet\Entities\NewsletterOptionFieldEntity;
@ -12,7 +13,6 @@ use MailPoet\Entities\SendingQueueEntity;
use MailPoet\Entities\StatisticsNewsletterEntity;
use MailPoet\Entities\SubscriberEntity;
use MailPoet\Entities\SubscriberSegmentEntity;
use MailPoet\Tasks\Sending;
use MailPoet\Test\DataFactories\Newsletter;
use MailPoet\Test\DataFactories\NewsletterOptionField;
use MailPoet\Test\DataFactories\Segment;
@ -120,7 +120,7 @@ class ReEngagementSchedulerTest extends \MailPoetTest {
$this->entityManager->refresh($task);
$this->assertInstanceOf(ScheduledTaskEntity::class, $task);
verify($task->getStatus())->equals(ScheduledTaskEntity::STATUS_SCHEDULED);
verify($task->getType())->equals(Sending::TASK_TYPE);
verify($task->getType())->equals(SendingQueue::TASK_TYPE);
$scheduledAt = $task->getScheduledAt();
$this->assertInstanceOf(\DateTimeInterface::class, $scheduledAt);
verify($scheduledAt->getTimestamp())->equalsWithDelta(Carbon::now()->getTimestamp(), 1);

4
mailpoet/tests/integration/Newsletter/Segment/NewsletterSegmentRepositoryTest.php
View File

@ -3,6 +3,7 @@
namespace MailPoet\Newsletter\Segment;
use Codeception\Util\Fixtures;
use MailPoet\Cron\Workers\SendingQueue\SendingQueue;
use MailPoet\Entities\NewsletterEntity;
use MailPoet\Entities\NewsletterOptionEntity;
use MailPoet\Entities\NewsletterOptionFieldEntity;
@ -10,7 +11,6 @@ use MailPoet\Entities\NewsletterSegmentEntity;
use MailPoet\Entities\ScheduledTaskEntity;
use MailPoet\Entities\SegmentEntity;
use MailPoet\Entities\SendingQueueEntity;
use MailPoet\Tasks\Sending as SendingTask;
use MailPoet\Test\DataFactories\NewsletterOptionField;
class NewsletterSegmentRepositoryTest extends \MailPoetTest {
@ -113,7 +113,7 @@ class NewsletterSegmentRepositoryTest extends \MailPoetTest {
private function createQueueWithTaskAndSegment(NewsletterEntity $newsletter, $status = ScheduledTaskEntity::STATUS_SCHEDULED): SendingQueueEntity {
$task = new ScheduledTaskEntity();
$task->setType(SendingTask::TASK_TYPE);
$task->setType(SendingQueue::TASK_TYPE);
$task->setStatus($status);
$this->entityManager->persist($task);

13
mailpoet/tests/integration/Newsletter/Sending/ScheduledTasksRepositoryTest.php
View File

@ -5,7 +5,6 @@ namespace MailPoet\Newsletter\Sending;
use MailPoet\Cron\Workers\Bounce;
use MailPoet\Cron\Workers\SendingQueue\SendingQueue as SendingQueueWorker;
use MailPoet\Entities\ScheduledTaskEntity;
use MailPoet\Tasks\Sending as SendingTask;
use MailPoet\Test\DataFactories\ScheduledTask as ScheduledTaskFactory;
use MailPoet\Test\DataFactories\SendingQueue;
use MailPoetVendor\Carbon\Carbon;
@ -112,7 +111,7 @@ class ScheduledTasksRepositoryTest extends \MailPoetTest {
}
public function testItCanFetchBasicTasksData() {
$task1 = $this->scheduledTaskFactory->create(SendingTask::TASK_TYPE, ScheduledTaskEntity::STATUS_SCHEDULED, Carbon::now()->addDay());
$task1 = $this->scheduledTaskFactory->create(SendingQueueWorker::TASK_TYPE, ScheduledTaskEntity::STATUS_SCHEDULED, Carbon::now()->addDay());
$task2 = $this->scheduledTaskFactory->create(Bounce::TASK_TYPE, ScheduledTaskEntity::VIRTUAL_STATUS_RUNNING, Carbon::now()->addDay());
$data = $this->repository->getLatestTasks();
verify(count($data))->equals(2);
@ -124,7 +123,7 @@ class ScheduledTasksRepositoryTest extends \MailPoetTest {
}, $data);
$this->assertContains($task1->getId(), $ids);
$this->assertContains($task2->getId(), $ids);
$this->assertContains(SendingTask::TASK_TYPE, $types);
$this->assertContains(SendingQueueWorker::TASK_TYPE, $types);
$this->assertContains(Bounce::TASK_TYPE, $types);
verify(is_int($data[1]->getPriority()))->true();
verify($data[1]->getUpdatedAt())->instanceOf(\DateTimeInterface::class);
@ -134,7 +133,7 @@ class ScheduledTasksRepositoryTest extends \MailPoetTest {
}
public function testItCanFilterTasksByType() {
$this->scheduledTaskFactory->create(SendingTask::TASK_TYPE, ScheduledTaskEntity::STATUS_COMPLETED, Carbon::now()->addDay());
$this->scheduledTaskFactory->create(SendingQueueWorker::TASK_TYPE, ScheduledTaskEntity::STATUS_COMPLETED, Carbon::now()->addDay());
$this->scheduledTaskFactory->create(Bounce::TASK_TYPE, ScheduledTaskEntity::STATUS_COMPLETED, Carbon::now()->addDay());
$data = $this->repository->getLatestTasks(Bounce::TASK_TYPE);
verify(count($data))->equals(1);
@ -142,8 +141,8 @@ class ScheduledTasksRepositoryTest extends \MailPoetTest {
}
public function testItCanFilterTasksByStatus() {
$this->scheduledTaskFactory->create(SendingTask::TASK_TYPE, ScheduledTaskEntity::STATUS_COMPLETED, Carbon::now()->addDay());
$this->scheduledTaskFactory->create(SendingTask::TASK_TYPE, ScheduledTaskEntity::STATUS_PAUSED, Carbon::now()->addDay());
$this->scheduledTaskFactory->create(SendingQueueWorker::TASK_TYPE, ScheduledTaskEntity::STATUS_COMPLETED, Carbon::now()->addDay());
$this->scheduledTaskFactory->create(SendingQueueWorker::TASK_TYPE, ScheduledTaskEntity::STATUS_PAUSED, Carbon::now()->addDay());
$data = $this->repository->getLatestTasks(null, [ScheduledTaskEntity::STATUS_COMPLETED]);
verify(count($data))->equals(1);
verify($data[0]->getStatus())->equals(ScheduledTaskEntity::STATUS_COMPLETED);
@ -151,7 +150,7 @@ class ScheduledTasksRepositoryTest extends \MailPoetTest {
public function testItDoesNotFailForSendingTaskWithoutQueue() {
$this->scheduledTaskFactory->create(
SendingTask::TASK_TYPE,
SendingQueueWorker::TASK_TYPE,
ScheduledTaskEntity::VIRTUAL_STATUS_RUNNING,
Carbon::now()->addDay()
);

4
mailpoet/tests/integration/Router/Endpoints/TrackTest.php
View File

@ -3,6 +3,7 @@
namespace MailPoet\Test\Router\Endpoints;
use Codeception\Stub;
use MailPoet\Cron\Workers\SendingQueue\SendingQueue;
use MailPoet\Cron\Workers\StatsNotifications\NewsletterLinkRepository;
use MailPoet\Entities\NewsletterEntity;
use MailPoet\Entities\NewsletterLinkEntity;
@ -14,7 +15,6 @@ use MailPoet\Newsletter\Sending\ScheduledTaskSubscribersRepository;
use MailPoet\Newsletter\Sending\SendingQueuesRepository;
use MailPoet\Router\Endpoints\Track;
use MailPoet\Subscribers\LinkTokens;
use MailPoet\Tasks\Sending;
use MailPoet\Test\DataFactories\Newsletter as NewsletterFactory;
use MailPoet\Test\DataFactories\NewsletterLink as NewsletterLinkFactory;
@ -180,7 +180,7 @@ class TrackTest extends \MailPoetTest {
->withSendingQueue()
->create();
$scheduledTaskEntity = $newsletter->getLatestQueue()->getTask();
$scheduledTaskEntity->setType(Sending::TASK_TYPE);
$scheduledTaskEntity->setType(SendingQueue::TASK_TYPE);
$this->entityManager->persist($scheduledTaskEntity);
$scheduledTaskSubscriber = new ScheduledTaskSubscriberEntity($scheduledTaskEntity, $this->subscriber, 1);

12
mailpoet/tests/integration/Segments/SubscribersFinderTest.php
View File

@ -3,12 +3,12 @@
namespace MailPoet\Segments;
use Codeception\Util\Stub;
use MailPoet\Cron\Workers\SendingQueue\SendingQueue;
use MailPoet\Entities\ScheduledTaskEntity;
use MailPoet\Entities\SegmentEntity;
use MailPoet\Entities\SubscriberEntity;
use MailPoet\InvalidStateException;
use MailPoet\Newsletter\Sending\ScheduledTaskSubscribersRepository;
use MailPoet\Tasks\Sending as SendingTask;
use MailPoet\Test\DataFactories\DynamicSegment;
use MailPoet\Test\DataFactories\ScheduledTask as ScheduledTaskFactory;
use MailPoet\Test\DataFactories\Segment as SegmentFactory;
@ -55,7 +55,7 @@ class SubscribersFinderTest extends \MailPoetTest {
->create();
$scheduledTaskFactory = new ScheduledTaskFactory();
$this->scheduledTask = $scheduledTaskFactory->create(SendingTask::TASK_TYPE, ScheduledTaskEntity::STATUS_SCHEDULED, new Carbon());
$this->scheduledTask = $scheduledTaskFactory->create(SendingQueue::TASK_TYPE, ScheduledTaskEntity::STATUS_SCHEDULED, new Carbon());
$this->segmentsRepository = $this->diContainer->get(SegmentsRepository::class);
$this->subscribersFinder = $this->diContainer->get(SubscribersFinder::class);
$this->scheduledTaskSubscribersRepository = $this->diContainer->get(ScheduledTaskSubscribersRepository::class);
@ -178,20 +178,20 @@ class SubscribersFinderTest extends \MailPoetTest {
$this->assertIsInt($dynamicSegment->getId());
// Without filtering
$task = (new ScheduledTaskFactory())->create(SendingTask::TASK_TYPE, ScheduledTaskEntity::STATUS_SCHEDULED, new Carbon());
$task = (new ScheduledTaskFactory())->create(SendingQueue::TASK_TYPE, ScheduledTaskEntity::STATUS_SCHEDULED, new Carbon());
$staticCount = $this->subscribersFinder->addSubscribersToTaskFromSegments($task, [$staticSegment->getId()]);
verify($staticCount)->equals(2);
$task = (new ScheduledTaskFactory())->create(SendingTask::TASK_TYPE, ScheduledTaskEntity::STATUS_SCHEDULED, new Carbon());
$task = (new ScheduledTaskFactory())->create(SendingQueue::TASK_TYPE, ScheduledTaskEntity::STATUS_SCHEDULED, new Carbon());
$dynamicCount = $this->subscribersFinder->addSubscribersToTaskFromSegments($task, [$dynamicSegment->getId()]);
verify($dynamicCount)->equals(4);
// With filtering
$task = (new ScheduledTaskFactory())->create(SendingTask::TASK_TYPE, ScheduledTaskEntity::STATUS_SCHEDULED, new Carbon());
$task = (new ScheduledTaskFactory())->create(SendingQueue::TASK_TYPE, ScheduledTaskEntity::STATUS_SCHEDULED, new Carbon());
$staticCount = $this->subscribersFinder->addSubscribersToTaskFromSegments($task, [$staticSegment->getId()], $filterSegment->getId());
verify($staticCount)->equals(1);
$task = (new ScheduledTaskFactory())->create(SendingTask::TASK_TYPE, ScheduledTaskEntity::STATUS_SCHEDULED, new Carbon());
$task = (new ScheduledTaskFactory())->create(SendingQueue::TASK_TYPE, ScheduledTaskEntity::STATUS_SCHEDULED, new Carbon());
$dynamicCount = $this->subscribersFinder->addSubscribersToTaskFromSegments($task, [$dynamicSegment->getId()], $filterSegment->getId());
verify($dynamicCount)->equals(2);
}

4
mailpoet/tests/integration/Statistics/StatisticsOpensRepositoryTest.php
View File

@ -2,6 +2,7 @@
namespace MailPoet\Statistics;
use MailPoet\Cron\Workers\SendingQueue\SendingQueue;
use MailPoet\Entities\NewsletterEntity;
use MailPoet\Entities\ScheduledTaskEntity;
use MailPoet\Entities\ScheduledTaskSubscriberEntity;
@ -13,7 +14,6 @@ use MailPoet\Entities\SubscriberEntity;
use MailPoet\Entities\SubscriberSegmentEntity;
use MailPoet\Segments\SegmentsRepository;
use MailPoet\Subscribers\SubscribersRepository;
use MailPoet\Tasks\Sending;
use MailPoetVendor\Carbon\Carbon;
use MailPoetVendor\Carbon\CarbonImmutable;
@ -282,7 +282,7 @@ class StatisticsOpensRepositoryTest extends \MailPoetTest {
private function createSendingTask(SubscriberEntity $subscriber): ScheduledTaskEntity {
$task = new ScheduledTaskEntity();
$task->setType(Sending::TASK_TYPE);
$task->setType(SendingQueue::TASK_TYPE);
$this->entityManager->persist($task);
$sub = new ScheduledTaskSubscriberEntity($task, $subscriber);
$this->entityManager->persist($sub);

4
mailpoet/tests/integration/Statistics/Track/OpensTest.php
View File

@ -5,6 +5,7 @@ namespace MailPoet\Test\Statistics\Track;
use Codeception\Stub;
use Codeception\Stub\Expected;
use MailPoet\Config\SubscriberChangesNotifier;
use MailPoet\Cron\Workers\SendingQueue\SendingQueue;
use MailPoet\Entities\NewsletterEntity;
use MailPoet\Entities\ScheduledTaskEntity;
use MailPoet\Entities\SendingQueueEntity;
@ -16,7 +17,6 @@ use MailPoet\Statistics\Track\Opens;
use MailPoet\Statistics\UserAgentsRepository;
use MailPoet\Subscribers\LinkTokens;
use MailPoet\Subscribers\SubscribersRepository;
use MailPoet\Tasks\Sending as SendingTask;
use MailPoet\WP\Functions as WPFunctions;
use MailPoetVendor\Carbon\Carbon;
@ -57,7 +57,7 @@ class OpensTest extends \MailPoetTest {
$this->entityManager->persist($subscriber);
// create queue
$task = new ScheduledTaskEntity();
$task->setType(SendingTask::TASK_TYPE);
$task->setType(SendingQueue::TASK_TYPE);
$task->setStatus(ScheduledTaskEntity::STATUS_COMPLETED);
$this->entityManager->persist($task);

4
mailpoet/tests/integration/Subscribers/InactiveSubscribersControllerTest.php
View File

@ -2,6 +2,7 @@
namespace MailPoet\Subscribers;
use MailPoet\Cron\Workers\SendingQueue\SendingQueue;
use MailPoet\Entities\NewsletterEntity;
use MailPoet\Entities\ScheduledTaskEntity;
use MailPoet\Entities\ScheduledTaskSubscriberEntity;
@ -9,7 +10,6 @@ use MailPoet\Entities\SendingQueueEntity;
use MailPoet\Entities\SettingEntity;
use MailPoet\Entities\StatisticsOpenEntity;
use MailPoet\Entities\SubscriberEntity;
use MailPoet\Tasks\Sending;
use MailPoetVendor\Carbon\Carbon;
use MailPoetVendor\Doctrine\ORM\EntityManager;
@ -256,7 +256,7 @@ class InactiveSubscribersControllerTest extends \MailPoetTest {
private function createCompletedSendingTask(int $processedDaysAgo = 0): array {
$processedAt = (new Carbon())->subDays($processedDaysAgo);
$task = new ScheduledTaskEntity();
$task->setType(Sending::TASK_TYPE);
$task->setType(SendingQueue::TASK_TYPE);
$task->setStatus(ScheduledTaskEntity::STATUS_COMPLETED);
$task->setCreatedAt($processedAt);
$task->setProcessedAt($processedAt);

4
mailpoet/tests/integration/Subscribers/SubscribersEmailCountsControllerTest.php
View File

@ -2,12 +2,12 @@
namespace MailPoet\Subscribers;
use MailPoet\Cron\Workers\SendingQueue\SendingQueue;
use MailPoet\Entities\NewsletterEntity;
use MailPoet\Entities\ScheduledTaskEntity;
use MailPoet\Entities\ScheduledTaskSubscriberEntity;
use MailPoet\Entities\SendingQueueEntity;
use MailPoet\Entities\SubscriberEntity;
use MailPoet\Tasks\Sending;
use MailPoetVendor\Carbon\Carbon;
use MailPoetVendor\Doctrine\ORM\EntityManager;
@ -197,7 +197,7 @@ class SubscribersEmailCountsControllerTest extends \MailPoetTest {
private function createCompletedSendingTask(int $processedDaysAgo = 0): array {
$processedAt = (new Carbon())->subDays($processedDaysAgo);
$task = new ScheduledTaskEntity();
$task->setType(Sending::TASK_TYPE);
$task->setType(SendingQueue::TASK_TYPE);
$task->setStatus(ScheduledTaskEntity::STATUS_COMPLETED);
$task->setCreatedAt($processedAt);
$task->setProcessedAt($processedAt);

3
mailpoet/tests/integration/Tasks/SendingTest.php
View File

@ -2,6 +2,7 @@
namespace MailPoet\Test\Tasks;
use MailPoet\Cron\Workers\SendingQueue\SendingQueue as SendingQueueWorker;
use MailPoet\Entities\ScheduledTaskEntity;
use MailPoet\Entities\ScheduledTaskSubscriberEntity;
use MailPoet\Entities\SubscriberEntity;
@ -316,7 +317,7 @@ class SendingTest extends \MailPoetTest {
public function createNewScheduledTask() {
$task = ScheduledTask::create();
$task->type = SendingTask::TASK_TYPE;
$task->type = SendingQueueWorker::TASK_TYPE;
return $task->save();
}