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]
This commit is contained in:
@@ -1269,7 +1269,7 @@ class SendingQueueTest extends \MailPoetTest {
|
|||||||
|
|
||||||
public function testItPauseSendingTaskThatHasTrashedSegment() {
|
public function testItPauseSendingTaskThatHasTrashedSegment() {
|
||||||
$newsletter = $this->createNewsletter(NewsletterEntity::TYPE_STANDARD, 'Subject With Trashed', NewsletterEntity::STATUS_SENDING);
|
$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 = $this->createSegment('Segment test', SegmentEntity::TYPE_DEFAULT);
|
||||||
$segment->setDeletedAt(new \DateTime());
|
$segment->setDeletedAt(new \DateTime());
|
||||||
$this->entityManager->flush();
|
$this->entityManager->flush();
|
||||||
@@ -1289,7 +1289,7 @@ class SendingQueueTest extends \MailPoetTest {
|
|||||||
|
|
||||||
public function testItPauseSendingTaskThatHasDeletedSegment() {
|
public function testItPauseSendingTaskThatHasDeletedSegment() {
|
||||||
$newsletter = $this->createNewsletter(NewsletterEntity::TYPE_STANDARD, 'Subject With Deleted', NewsletterEntity::STATUS_SENDING);
|
$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);
|
$segment = $this->createSegment('Segment test', SegmentEntity::TYPE_DEFAULT);
|
||||||
$this->addSegmentToNewsletter($newsletter, $segment);
|
$this->addSegmentToNewsletter($newsletter, $segment);
|
||||||
$this->entityManager->createQueryBuilder()->delete(SegmentEntity::class, 's')
|
$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);
|
$newsletter = $this->createNewsletter(NewsletterEntity::TYPE_STANDARD, 'Subject With Deleted', NewsletterEntity::STATUS_SENDING);
|
||||||
[$segment, $subscriber] = $this->createListWithSubscriber();
|
[$segment, $subscriber] = $this->createListWithSubscriber();
|
||||||
$this->addSegmentToNewsletter($newsletter, $segment);
|
$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);
|
$subscriber->setStatus(SubscriberEntity::STATUS_UNSUBSCRIBED);
|
||||||
$this->entityManager->persist($subscriber);
|
$this->entityManager->persist($subscriber);
|
||||||
$this->entityManager->flush();
|
$this->entityManager->flush();
|
||||||
@@ -1447,7 +1447,7 @@ class SendingQueueTest extends \MailPoetTest {
|
|||||||
$this->entityManager->flush();
|
$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 = new ScheduledTaskEntity();
|
||||||
$task->setType(SendingQueueWorker::TASK_TYPE);
|
$task->setType(SendingQueueWorker::TASK_TYPE);
|
||||||
$task->setStatus($status);
|
$task->setStatus($status);
|
||||||
|
Reference in New Issue
Block a user