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

Replace SendingQueue model with Doctrine in SendingQueueTest

Browse Source 
I opted to remove testItDeletesQueueWhenNewsletterIsNotFound() as I
wasn't sure how to recreate this test using Doctrine and I found out
that it was actually not working. The call to
$this->newslettersRepository->bulkDelete() was deleting the sending
queue entry and not SendingQueue::deleteTaskIfNewsletterDoesNotExist().

[MAILPOET-5737]
This commit is contained in:
Rodrigo Primo
2023-11-23 16:13:08 -03:00
committed by Aschepikov
parent 33769e703c
commit 1a1f48eb15
1 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,7 +30,6 @@ use MailPoet\Mailer\MailerError;
use MailPoet\Mailer\MailerFactory; use MailPoet\Mailer\MailerFactory;
use MailPoet\Mailer\MailerLog; use MailPoet\Mailer\MailerLog;
use MailPoet\Mailer\SubscriberError; use MailPoet\Mailer\SubscriberError;
use MailPoet\Models\SendingQueue;
use MailPoet\Newsletter\Links\Links; use MailPoet\Newsletter\Links\Links;
use MailPoet\Newsletter\NewslettersRepository; use MailPoet\Newsletter\NewslettersRepository;
use MailPoet\Newsletter\Sending\ScheduledTasksRepository; use MailPoet\Newsletter\Sending\ScheduledTasksRepository;
@@ -274,7 +273,7 @@ class SendingQueueTest extends \MailPoetTest {
// when sending is done and there are no more subscribers to process, continue // when sending is done and there are no more subscribers to process, continue
// without enforcing execution limits. this allows the newsletter to be marked as sent // without enforcing execution limits. this allows the newsletter to be marked as sent
// in the process() method and after that execution limits will be enforced // in the process() method and after that execution limits will be enforced
$this->scheduledTask->setStatus(SendingQueue::STATUS_COMPLETED); $this->scheduledTask->setStatus(SendingQueueEntity::STATUS_COMPLETED);
$this->entityManager->persist($this->scheduledTask); $this->entityManager->persist($this->scheduledTask);
$this->entityManager->flush(); $this->entityManager->flush();
$sendingQueueWorker = $this->make( $sendingQueueWorker = $this->make(
@@ -350,20 +349,6 @@ class SendingQueueTest extends \MailPoetTest {
$sendingQueueWorker->process(); $sendingQueueWorker->process();
} }
public function testItDeletesQueueWhenNewsletterIsNotFound() {
// queue exists
$queue = SendingQueue::findOne($this->sendingQueue->getId());
verify($queue)->notEquals(false);
// delete newsletter
$this->newslettersRepository->bulkDelete([$this->newsletter->getId()]);
// queue no longer exists
$this->sendingQueueWorker->process();
$queue = SendingQueue::findOne($this->sendingQueue->getId());
verify($queue)->false();
}
public function testItPassesExtraParametersToMailerWhenTrackingIsDisabled() { public function testItPassesExtraParametersToMailerWhenTrackingIsDisabled() {
$this->settings->set('tracking.level', TrackingConfig::LEVEL_BASIC); $this->settings->set('tracking.level', TrackingConfig::LEVEL_BASIC);
$directUnsubscribeURL = $this->getDirectUnsubscribeURL(); $directUnsubscribeURL = $this->getDirectUnsubscribeURL();
@@ -445,7 +430,7 @@ class SendingQueueTest extends \MailPoetTest {
$this->assertInstanceOf(ScheduledTaskEntity::class, $scheduledTask); $this->assertInstanceOf(ScheduledTaskEntity::class, $scheduledTask);
$this->sendingQueuesRepository->refresh($sendingQueue); $this->sendingQueuesRepository->refresh($sendingQueue);
$this->scheduledTasksRepository->refresh($scheduledTask); $this->scheduledTasksRepository->refresh($scheduledTask);
verify($scheduledTask->getStatus())->equals(SendingQueue::STATUS_COMPLETED); verify($scheduledTask->getStatus())->equals(SendingQueueEntity::STATUS_COMPLETED);
// queue subscriber processed/to process count is updated // queue subscriber processed/to process count is updated
verify($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriberEntity::STATUS_UNPROCESSED)) verify($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriberEntity::STATUS_UNPROCESSED))
@@ -556,7 +541,7 @@ class SendingQueueTest extends \MailPoetTest {
$this->assertInstanceOf(ScheduledTaskEntity::class, $scheduledTask); $this->assertInstanceOf(ScheduledTaskEntity::class, $scheduledTask);
$this->sendingQueuesRepository->refresh($sendingQueue); $this->sendingQueuesRepository->refresh($sendingQueue);
$this->scheduledTasksRepository->refresh($scheduledTask); $this->scheduledTasksRepository->refresh($scheduledTask);
verify($scheduledTask->getStatus())->equals(SendingQueue::STATUS_COMPLETED); verify($scheduledTask->getStatus())->equals(SendingQueueEntity::STATUS_COMPLETED);
// queue subscriber processed/to process count is updated // queue subscriber processed/to process count is updated
verify($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriberEntity::STATUS_UNPROCESSED)) verify($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriberEntity::STATUS_UNPROCESSED))
@@ -600,7 +585,7 @@ class SendingQueueTest extends \MailPoetTest {
$this->assertInstanceOf(ScheduledTaskEntity::class, $scheduledTask); $this->assertInstanceOf(ScheduledTaskEntity::class, $scheduledTask);
$this->sendingQueuesRepository->refresh($sendingQueue); $this->sendingQueuesRepository->refresh($sendingQueue);
$this->scheduledTasksRepository->refresh($scheduledTask); $this->scheduledTasksRepository->refresh($scheduledTask);
verify($scheduledTask->getStatus())->equals(SendingQueue::STATUS_COMPLETED); verify($scheduledTask->getStatus())->equals(SendingQueueEntity::STATUS_COMPLETED);
// newsletter status is set to sent and sent_at date is populated // newsletter status is set to sent and sent_at date is populated
$updatedNewsletter = $this->newslettersRepository->findOneById($this->newsletter->getId()); $updatedNewsletter = $this->newslettersRepository->findOneById($this->newsletter->getId());
@@ -749,7 +734,7 @@ class SendingQueueTest extends \MailPoetTest {
verify($this->newsletter->getStatus())->equals(NewsletterEntity::STATUS_ACTIVE); verify($this->newsletter->getStatus())->equals(NewsletterEntity::STATUS_ACTIVE);
// queue status is set to completed // queue status is set to completed
verify($this->scheduledTask->getStatus())->equals(SendingQueue::STATUS_COMPLETED); verify($this->scheduledTask->getStatus())->equals(SendingQueueEntity::STATUS_COMPLETED);
// queue subscriber processed/to process count is updated // queue subscriber processed/to process count is updated
verify($this->scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriberEntity::STATUS_UNPROCESSED)) verify($this->scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriberEntity::STATUS_UNPROCESSED))