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

Rename NewsletterTest::queue to NewsletterTest::sendingTask

Browse Source 
Doing this for consistency and to better makr that this property
contains an instance of \MailPoet\Tasks\Sending and not an instance
of \MailPoet\Models\SendingQueue.

[MAILPOET-4363]
This commit is contained in:
Rodrigo Primo
2022-08-29 12:01:27 -03:00
committed by Aschepikov
parent 168ce20a40
commit 3b9a60c039
1 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
mailpoet/tests/integration/Cron/Workers/SendingQueue/Tasks/NewsletterTest.php
View File

@@ -46,7 +46,7 @@ class NewsletterTest extends \MailPoetTest {
private $parentNewsletter; private $parentNewsletter;
/** @var SendingTask */ /** @var SendingTask */
private $queue; private $sendingTask;
/** @var LoggerFactory */ /** @var LoggerFactory */
private $loggerFactory; private $loggerFactory;
@@ -78,9 +78,9 @@ class NewsletterTest extends \MailPoetTest {
$this->parentNewsletter->body = 'parent body'; $this->parentNewsletter->body = 'parent body';
$this->parentNewsletter->preheader = ''; $this->parentNewsletter->preheader = '';
$this->parentNewsletter->save(); $this->parentNewsletter->save();
$this->queue = SendingTask::create(); $this->sendingTask = SendingTask::create();
$this->queue->newsletter_id = $this->newsletter->id; $this->sendingTask->newsletter_id = $this->newsletter->id;
$this->queue->save(); $this->sendingTask->save();
$this->loggerFactory = LoggerFactory::getInstance(); $this->loggerFactory = LoggerFactory::getInstance();
$this->newslettersRepository = $this->diContainer->get(NewslettersRepository::class); $this->newslettersRepository = $this->diContainer->get(NewslettersRepository::class);
$this->newsletterLinkRepository = $this->diContainer->get(NewsletterLinkRepository::class); $this->newsletterLinkRepository = $this->diContainer->get(NewsletterLinkRepository::class);
@@ -96,25 +96,25 @@ class NewsletterTest extends \MailPoetTest {
$newsletter = $this->newsletter; $newsletter = $this->newsletter;
$newsletter->status = NewsletterEntity::STATUS_DRAFT; $newsletter->status = NewsletterEntity::STATUS_DRAFT;
$newsletter->save(); $newsletter->save();
expect($this->newsletterTask->getNewsletterFromQueue($this->queue))->false(); expect($this->newsletterTask->getNewsletterFromQueue($this->sendingTask))->false();
// active or sending statuses return newsletter // active or sending statuses return newsletter
$newsletter = $this->newsletter; $newsletter = $this->newsletter;
$newsletter->status = NewsletterEntity::STATUS_ACTIVE; $newsletter->status = NewsletterEntity::STATUS_ACTIVE;
$newsletter->save(); $newsletter->save();
expect($this->newsletterTask->getNewsletterFromQueue($this->queue))->isInstanceOf('Mailpoet\Models\Newsletter'); expect($this->newsletterTask->getNewsletterFromQueue($this->sendingTask))->isInstanceOf('Mailpoet\Models\Newsletter');
$newsletter = $this->newsletter; $newsletter = $this->newsletter;
$newsletter->status = NewsletterEntity::STATUS_SENDING; $newsletter->status = NewsletterEntity::STATUS_SENDING;
$newsletter->save(); $newsletter->save();
expect($this->newsletterTask->getNewsletterFromQueue($this->queue))->isInstanceOf('Mailpoet\Models\Newsletter'); expect($this->newsletterTask->getNewsletterFromQueue($this->sendingTask))->isInstanceOf('Mailpoet\Models\Newsletter');
} }
public function testItDoesNotGetDeletedNewsletter() { public function testItDoesNotGetDeletedNewsletter() {
$newsletter = $this->newsletter; $newsletter = $this->newsletter;
$newsletter->set_expr('deleted_at', 'NOW()'); $newsletter->set_expr('deleted_at', 'NOW()');
$newsletter->save(); $newsletter->save();
expect($this->newsletterTask->getNewsletterFromQueue($this->queue))->false(); expect($this->newsletterTask->getNewsletterFromQueue($this->sendingTask))->false();
} }
public function testItDoesNotGetNewsletterWhenParentNewsletterStatusIsNotActiveOrSending() { public function testItDoesNotGetNewsletterWhenParentNewsletterStatusIsNotActiveOrSending() {
@@ -126,7 +126,7 @@ class NewsletterTest extends \MailPoetTest {
$newsletter->type = NewsletterEntity::TYPE_NOTIFICATION_HISTORY; $newsletter->type = NewsletterEntity::TYPE_NOTIFICATION_HISTORY;
$newsletter->parentId = $parentNewsletter->id; $newsletter->parentId = $parentNewsletter->id;
$newsletter->save(); $newsletter->save();
expect($this->newsletterTask->getNewsletterFromQueue($this->queue))->false(); expect($this->newsletterTask->getNewsletterFromQueue($this->sendingTask))->false();
// active or sending statuses return newsletter // active or sending statuses return newsletter
$parentNewsletter = $this->parentNewsletter; $parentNewsletter = $this->parentNewsletter;
@@ -136,7 +136,7 @@ class NewsletterTest extends \MailPoetTest {
$newsletter->type = NewsletterEntity::TYPE_NOTIFICATION_HISTORY; $newsletter->type = NewsletterEntity::TYPE_NOTIFICATION_HISTORY;
$newsletter->parentId = $parentNewsletter->id; $newsletter->parentId = $parentNewsletter->id;
$newsletter->save(); $newsletter->save();
expect($this->newsletterTask->getNewsletterFromQueue($this->queue))->isInstanceOf('Mailpoet\Models\Newsletter'); expect($this->newsletterTask->getNewsletterFromQueue($this->sendingTask))->isInstanceOf('Mailpoet\Models\Newsletter');
$parentNewsletter = $this->parentNewsletter; $parentNewsletter = $this->parentNewsletter;
$parentNewsletter->status = NewsletterEntity::STATUS_SENDING; $parentNewsletter->status = NewsletterEntity::STATUS_SENDING;
@@ -145,7 +145,7 @@ class NewsletterTest extends \MailPoetTest {
$newsletter->type = NewsletterEntity::TYPE_NOTIFICATION_HISTORY; $newsletter->type = NewsletterEntity::TYPE_NOTIFICATION_HISTORY;
$newsletter->parentId = $parentNewsletter->id; $newsletter->parentId = $parentNewsletter->id;
$newsletter->save(); $newsletter->save();
expect($this->newsletterTask->getNewsletterFromQueue($this->queue))->isInstanceOf('Mailpoet\Models\Newsletter'); expect($this->newsletterTask->getNewsletterFromQueue($this->sendingTask))->isInstanceOf('Mailpoet\Models\Newsletter');
} }
public function testItDoesNotGetDeletedNewsletterWhenParentNewsletterIsDeleted() { public function testItDoesNotGetDeletedNewsletterWhenParentNewsletterIsDeleted() {
@@ -156,11 +156,11 @@ class NewsletterTest extends \MailPoetTest {
$newsletter->type = NewsletterEntity::TYPE_NOTIFICATION_HISTORY; $newsletter->type = NewsletterEntity::TYPE_NOTIFICATION_HISTORY;
$newsletter->parentId = $parentNewsletter->id; $newsletter->parentId = $parentNewsletter->id;
$newsletter->save(); $newsletter->save();
expect($this->newsletterTask->getNewsletterFromQueue($this->queue))->false(); expect($this->newsletterTask->getNewsletterFromQueue($this->sendingTask))->false();
} }
public function testItReturnsNewsletterObjectWhenRenderedNewsletterBodyExistsInTheQueue() { public function testItReturnsNewsletterObjectWhenRenderedNewsletterBodyExistsInTheQueue() {
$queue = $this->queue; $queue = $this->sendingTask;
$queue->newsletterRenderedBody = ['html' => 'test', 'text' => 'test']; $queue->newsletterRenderedBody = ['html' => 'test', 'text' => 'test'];
$result = $this->newsletterTask->preProcessNewsletter($this->newsletter, $queue); $result = $this->newsletterTask->preProcessNewsletter($this->newsletter, $queue);
expect($result instanceof \MailPoet\Models\Newsletter)->true(); expect($result instanceof \MailPoet\Models\Newsletter)->true();
@@ -172,7 +172,7 @@ class NewsletterTest extends \MailPoetTest {
]); ]);
$newsletterTask = new NewsletterTask($wp); $newsletterTask = new NewsletterTask($wp);
$newsletterTask->trackingEnabled = true; $newsletterTask->trackingEnabled = true;
$newsletterTask->preProcessNewsletter($this->newsletter, $this->queue); $newsletterTask->preProcessNewsletter($this->newsletter, $this->sendingTask);
$link = $this->newsletterLinkRepository->findOneBy(['newsletter' => $this->newsletter->id]); $link = $this->newsletterLinkRepository->findOneBy(['newsletter' => $this->newsletter->id]);
assert($link instanceof NewsletterLinkEntity); assert($link instanceof NewsletterLinkEntity);
$updatedQueue = SendingTask::getByNewsletterId($this->newsletter->id); $updatedQueue = SendingTask::getByNewsletterId($this->newsletter->id);
@@ -194,7 +194,7 @@ class NewsletterTest extends \MailPoetTest {
]); ]);
$newsletterTask = new NewsletterTask($wp); $newsletterTask = new NewsletterTask($wp);
$newsletterTask->trackingEnabled = false; $newsletterTask->trackingEnabled = false;
$newsletterTask->preProcessNewsletter($this->newsletter, $this->queue); $newsletterTask->preProcessNewsletter($this->newsletter, $this->sendingTask);
$link = $this->newsletterLinkRepository->findOneBy(['newsletter' => $this->newsletter->id]); $link = $this->newsletterLinkRepository->findOneBy(['newsletter' => $this->newsletter->id]);
expect($link)->null(); expect($link)->null();
$updatedQueue = SendingTask::getByNewsletterId($this->newsletter->id); $updatedQueue = SendingTask::getByNewsletterId($this->newsletter->id);
@@ -219,7 +219,7 @@ class NewsletterTest extends \MailPoetTest {
$newsletter->body = str_replace('data-post-id', 'id', $newsletter->getBodyString()); $newsletter->body = str_replace('data-post-id', 'id', $newsletter->getBodyString());
$newsletter->save(); $newsletter->save();
// returned result is false // returned result is false
$result = $this->newsletterTask->preProcessNewsletter($this->newsletter, $this->queue); $result = $this->newsletterTask->preProcessNewsletter($this->newsletter, $this->sendingTask);
expect($result)->false(); expect($result)->false();
// newsletter is deleted. // newsletter is deleted.
$this->entityManager->clear(); // needed while part of the code uses Paris models and part uses Doctrine $this->entityManager->clear(); // needed while part of the code uses Paris models and part uses Doctrine
@@ -238,7 +238,7 @@ class NewsletterTest extends \MailPoetTest {
]); ]);
$this->newsletter->save(); $this->newsletter->save();
$newsletterTask = new NewsletterTask(new WPFunctions, $postsTask); $newsletterTask = new NewsletterTask(new WPFunctions, $postsTask);
$result = $newsletterTask->preProcessNewsletter($this->newsletter, $this->queue); $result = $newsletterTask->preProcessNewsletter($this->newsletter, $this->sendingTask);
$newsletterPost = $newsletterPostRepository->findOneBy(['newsletter' => $this->newsletter->id]); $newsletterPost = $newsletterPostRepository->findOneBy(['newsletter' => $this->newsletter->id]);
expect($newsletterPost)->isInstanceOf(NewsletterPostEntity::class); expect($newsletterPost)->isInstanceOf(NewsletterPostEntity::class);
expect($result)->notEquals(false); expect($result)->notEquals(false);
@@ -291,7 +291,7 @@ class NewsletterTest extends \MailPoetTest {
public function testItDoesNotRenderSubscriberShortcodeInSubjectWhenPreprocessingNewsletter() { public function testItDoesNotRenderSubscriberShortcodeInSubjectWhenPreprocessingNewsletter() {
$newsletter = $this->newsletter; $newsletter = $this->newsletter;
$newsletter->subject = 'Newsletter for [subscriber:firstname] [date:dordinal]'; $newsletter->subject = 'Newsletter for [subscriber:firstname] [date:dordinal]';
$queue = $this->queue; $queue = $this->sendingTask;
$newsletter = $this->newsletterTask->preProcessNewsletter($newsletter, $queue); $newsletter = $this->newsletterTask->preProcessNewsletter($newsletter, $queue);
$queue = SendingTask::getByNewsletterId($newsletter->id); $queue = SendingTask::getByNewsletterId($newsletter->id);
$wp = new WPFunctions(); $wp = new WPFunctions();
@@ -302,7 +302,7 @@ class NewsletterTest extends \MailPoetTest {
public function testItUsesADefaultSubjectIfRenderedSubjectIsEmptyWhenPreprocessingNewsletter() { public function testItUsesADefaultSubjectIfRenderedSubjectIsEmptyWhenPreprocessingNewsletter() {
$newsletter = $this->newsletter; $newsletter = $this->newsletter;
$newsletter->subject = ' [custom_shortcode:should_render_empty] '; $newsletter->subject = ' [custom_shortcode:should_render_empty] ';
$queue = $this->queue; $queue = $this->sendingTask;
$newsletter = $this->newsletterTask->preProcessNewsletter($newsletter, $queue); $newsletter = $this->newsletterTask->preProcessNewsletter($newsletter, $queue);
$queue = SendingTask::getByNewsletterId($newsletter->id); $queue = SendingTask::getByNewsletterId($newsletter->id);
expect($queue->newsletterRenderedSubject) expect($queue->newsletterRenderedSubject)
@@ -312,7 +312,7 @@ class NewsletterTest extends \MailPoetTest {
public function testItUsesRenderedNewsletterBodyAndSubjectFromQueueObjectWhenPreparingNewsletterForSending() { public function testItUsesRenderedNewsletterBodyAndSubjectFromQueueObjectWhenPreparingNewsletterForSending() {
$newsletterEntity = $this->newslettersRepository->findOneById($this->newsletter->id); $newsletterEntity = $this->newslettersRepository->findOneById($this->newsletter->id);
$this->assertInstanceOf(NewsletterEntity::class, $newsletterEntity); $this->assertInstanceOf(NewsletterEntity::class, $newsletterEntity);
$queue = $this->queue; $queue = $this->sendingTask;
$queue->newsletterRenderedBody = [ $queue->newsletterRenderedBody = [
'html' => 'queue HTML body', 'html' => 'queue HTML body',
'text' => 'queue TEXT body', 'text' => 'queue TEXT body',
@@ -336,13 +336,13 @@ class NewsletterTest extends \MailPoetTest {
} }
public function testItRendersShortcodesAndReplacesSubscriberDataInLinks() { public function testItRendersShortcodesAndReplacesSubscriberDataInLinks() {
$newsletter = $this->newsletterTask->preProcessNewsletter($this->newsletter, $this->queue); $newsletter = $this->newsletterTask->preProcessNewsletter($this->newsletter, $this->sendingTask);
$newsletterEntity = $this->newslettersRepository->findOneById($newsletter->id); $newsletterEntity = $this->newslettersRepository->findOneById($newsletter->id);
$this->assertInstanceOf(NewsletterEntity::class, $newsletterEntity); $this->assertInstanceOf(NewsletterEntity::class, $newsletterEntity);
$result = $this->newsletterTask->prepareNewsletterForSending( $result = $this->newsletterTask->prepareNewsletterForSending(
$newsletterEntity, $newsletterEntity,
$this->subscriber, $this->subscriber,
$this->queue $this->sendingTask
); );
expect($result['subject'])->stringContainsString($this->subscriber->getFirstName()); expect($result['subject'])->stringContainsString($this->subscriber->getFirstName());
expect($result['body']['html']) expect($result['body']['html'])
@@ -354,13 +354,13 @@ class NewsletterTest extends \MailPoetTest {
public function testItDoesNotReplaceSubscriberDataInLinksWhenTrackingIsNotEnabled() { public function testItDoesNotReplaceSubscriberDataInLinksWhenTrackingIsNotEnabled() {
$newsletterTask = $this->newsletterTask; $newsletterTask = $this->newsletterTask;
$newsletterTask->trackingEnabled = false; $newsletterTask->trackingEnabled = false;
$newsletter = $newsletterTask->preProcessNewsletter($this->newsletter, $this->queue); $newsletter = $newsletterTask->preProcessNewsletter($this->newsletter, $this->sendingTask);
$newsletterEntity = $this->newslettersRepository->findOneById($newsletter->id); $newsletterEntity = $this->newslettersRepository->findOneById($newsletter->id);
$this->assertInstanceOf(NewsletterEntity::class, $newsletterEntity); $this->assertInstanceOf(NewsletterEntity::class, $newsletterEntity);
$result = $newsletterTask->prepareNewsletterForSending( $result = $newsletterTask->prepareNewsletterForSending(
$newsletterEntity, $newsletterEntity,
$this->subscriber, $this->subscriber,
$this->queue $this->sendingTask
); );
expect($result['body']['html']) expect($result['body']['html'])
->stringNotContainsString(Router::NAME . '&endpoint=track&action=click&data='); ->stringNotContainsString(Router::NAME . '&endpoint=track&action=click&data=');
@@ -387,7 +387,7 @@ class NewsletterTest extends \MailPoetTest {
} }
public function testItLogsErrorWhenQueueWithCannotBeSaved() { public function testItLogsErrorWhenQueueWithCannotBeSaved() {
$queue = $this->queue; $queue = $this->sendingTask;
$queue->nonExistentColumn = true; // this will trigger save error $queue->nonExistentColumn = true; // this will trigger save error
try { try {
$this->newsletterTask->preProcessNewsletter($this->newsletter, $queue); $this->newsletterTask->preProcessNewsletter($this->newsletter, $queue);
@@ -428,7 +428,7 @@ class NewsletterTest extends \MailPoetTest {
} }
public function testItLogsErrorWhenNewlyRenderedNewsletterBodyIsInvalid() { public function testItLogsErrorWhenNewlyRenderedNewsletterBodyIsInvalid() {
$queue = $this->queue; $queue = $this->sendingTask;
$queueMock = $this->createMock(SendingTask::class); $queueMock = $this->createMock(SendingTask::class);
$queueMock $queueMock
->expects($this->any()) ->expects($this->any())
@@ -468,7 +468,7 @@ class NewsletterTest extends \MailPoetTest {
} }
public function testItPreProcessesNewsletterWhenNewlyRenderedNewsletterBodyIsValid() { public function testItPreProcessesNewsletterWhenNewlyRenderedNewsletterBodyIsValid() {
$queue = $this->queue; $queue = $this->sendingTask;
$queueMock = $this->createMock(SendingTask::class); $queueMock = $this->createMock(SendingTask::class);
$queueMock $queueMock
->expects($this->any()) ->expects($this->any())