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

Replace simple uses of Newsletter and Subscriber models with Doctrine

Browse Source 
[MAILPOET-5682]
This commit is contained in:
Rodrigo Primo
2023-11-21 10:43:24 -03:00
committed by Jan Jakeš
parent 90b56d3aa8
commit 5891e09418
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -128,11 +128,13 @@ class SendingQueueTest extends \MailPoetTest {
$this->subscriberSegment->subscriberId = (int)$this->subscriber->getId(); $this->subscriberSegment->subscriberId = (int)$this->subscriber->getId();
$this->subscriberSegment->segmentId = (int)$this->segment->id; $this->subscriberSegment->segmentId = (int)$this->segment->id;
$this->subscriberSegment->save(); $this->subscriberSegment->save();
/** @var Newsletter $newsletter */ /** @var Newsletter $newsletter */
$newsletter = Newsletter::create(); $newsletter = Newsletter::create();
$this->newsletter = $newsletter; $this->newsletter = $newsletter;
$this->newsletter->type = Newsletter::TYPE_STANDARD; $this->newsletter->type = NewsletterEntity::TYPE_STANDARD;
$this->newsletter->status = Newsletter::STATUS_ACTIVE; $this->newsletter->status = NewsletterEntity::STATUS_ACTIVE;
$this->newsletter->subject = Fixtures::get('newsletter_subject_template'); $this->newsletter->subject = Fixtures::get('newsletter_subject_template');
$this->newsletter->body = Fixtures::get('newsletter_body_template'); $this->newsletter->body = Fixtures::get('newsletter_body_template');
$this->newsletter->save(); $this->newsletter->save();
@@ -464,7 +466,7 @@ class SendingQueueTest extends \MailPoetTest {
// newsletter status is set to sent // newsletter status is set to sent
$updatedNewsletter = Newsletter::findOne($this->newsletter->id); $updatedNewsletter = Newsletter::findOne($this->newsletter->id);
$this->assertInstanceOf(Newsletter::class, $updatedNewsletter); $this->assertInstanceOf(Newsletter::class, $updatedNewsletter);
verify($updatedNewsletter->status)->equals(Newsletter::STATUS_SENT); verify($updatedNewsletter->status)->equals(NewsletterEntity::STATUS_SENT);
// queue status is set to completed // queue status is set to completed
$sendingQueue = $this->sendingQueuesRepository->findOneById($this->queue->id); $sendingQueue = $this->sendingQueuesRepository->findOneById($this->queue->id);
@@ -598,7 +600,7 @@ class SendingQueueTest extends \MailPoetTest {
// newsletter status is set to sent // newsletter status is set to sent
$updatedNewsletter = Newsletter::findOne($this->newsletter->id); $updatedNewsletter = Newsletter::findOne($this->newsletter->id);
$this->assertInstanceOf(Newsletter::class, $updatedNewsletter); $this->assertInstanceOf(Newsletter::class, $updatedNewsletter);
verify($updatedNewsletter->status)->equals(Newsletter::STATUS_SENT); verify($updatedNewsletter->status)->equals(NewsletterEntity::STATUS_SENT);
// queue status is set to completed // queue status is set to completed
$sendingQueue = $this->sendingQueuesRepository->findOneById($this->queue->id); $sendingQueue = $this->sendingQueuesRepository->findOneById($this->queue->id);
@@ -655,7 +657,7 @@ class SendingQueueTest extends \MailPoetTest {
// 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->id); $updatedNewsletter = $this->newslettersRepository->findOneById($this->newsletter->id);
$this->assertInstanceOf(NewsletterEntity::class, $updatedNewsletter); $this->assertInstanceOf(NewsletterEntity::class, $updatedNewsletter);
verify($updatedNewsletter->getStatus())->equals(Newsletter::STATUS_SENT); verify($updatedNewsletter->getStatus())->equals(NewsletterEntity::STATUS_SENT);
verify($updatedNewsletter->getSentAt())->equalsWithDelta($scheduledTask->getProcessedAt(), 1); verify($updatedNewsletter->getSentAt())->equalsWithDelta($scheduledTask->getProcessedAt(), 1);
// queue subscriber processed/to process count is updated // queue subscriber processed/to process count is updated
@@ -769,7 +771,7 @@ class SendingQueueTest extends \MailPoetTest {
$this->queue->updated_at = $originalUpdated; $this->queue->updated_at = $originalUpdated;
$this->queue->save(); $this->queue->save();
$this->newsletter->type = Newsletter::TYPE_WELCOME; $this->newsletter->type = NewsletterEntity::TYPE_WELCOME;
$this->newsletterSegment->delete(); $this->newsletterSegment->delete();
$sendingQueueWorker = $this->getSendingQueueWorker( $sendingQueueWorker = $this->getSendingQueueWorker(
@@ -783,7 +785,7 @@ class SendingQueueTest extends \MailPoetTest {
} }
public function testItCanProcessWelcomeNewsletters() { public function testItCanProcessWelcomeNewsletters() {
$this->newsletter->type = Newsletter::TYPE_WELCOME; $this->newsletter->type = NewsletterEntity::TYPE_WELCOME;
$this->newsletterSegment->delete(); $this->newsletterSegment->delete();
$sendingQueueWorker = $this->getSendingQueueWorker( $sendingQueueWorker = $this->getSendingQueueWorker(
@@ -806,7 +808,7 @@ class SendingQueueTest extends \MailPoetTest {
// newsletter status is set to sent // newsletter status is set to sent
$updatedNewsletter = Newsletter::findOne($this->newsletter->id); $updatedNewsletter = Newsletter::findOne($this->newsletter->id);
$this->assertInstanceOf(Newsletter::class, $updatedNewsletter); $this->assertInstanceOf(Newsletter::class, $updatedNewsletter);
verify($updatedNewsletter->status)->equals(Newsletter::STATUS_SENT); verify($updatedNewsletter->status)->equals(NewsletterEntity::STATUS_SENT);
// queue status is set to completed // queue status is set to completed
$sendingQueue = $this->sendingQueuesRepository->findOneById($this->queue->id); $sendingQueue = $this->sendingQueuesRepository->findOneById($this->queue->id);
@@ -835,8 +837,8 @@ class SendingQueueTest extends \MailPoetTest {
} }
public function testItPreventsSendingWelcomeEmailWhenSubscriberIsUnsubscribed() { public function testItPreventsSendingWelcomeEmailWhenSubscriberIsUnsubscribed() {
$this->newsletter->type = Newsletter::TYPE_WELCOME; $this->newsletter->type = NewsletterEntity::TYPE_WELCOME;
$this->subscriber->setStatus(Subscriber::STATUS_UNSUBSCRIBED); $this->subscriber->setStatus(SubscriberEntity::STATUS_UNSUBSCRIBED);
$this->entityManager->flush(); $this->entityManager->flush();
$this->newsletterSegment->delete(); $this->newsletterSegment->delete();
$this->entityManager->refresh($this->sendingQueueEntity); $this->entityManager->refresh($this->sendingQueueEntity);
@@ -1090,7 +1092,7 @@ class SendingQueueTest extends \MailPoetTest {
// newsletter is not sent to globally unsubscribed subscriber // newsletter is not sent to globally unsubscribed subscriber
$subscriber = $this->subscriber; $subscriber = $this->subscriber;
$subscriber->setStatus(Subscriber::STATUS_UNSUBSCRIBED); $subscriber->setStatus(SubscriberEntity::STATUS_UNSUBSCRIBED);
$this->entityManager->flush(); $this->entityManager->flush();
$this->entityManager->refresh($this->sendingQueueEntity); $this->entityManager->refresh($this->sendingQueueEntity);
$sendingQueueWorker->process(); $sendingQueueWorker->process();
@@ -1111,7 +1113,7 @@ class SendingQueueTest extends \MailPoetTest {
// newsletter is not sent to subscriber unsubscribed from segment // newsletter is not sent to subscriber unsubscribed from segment
$subscriberSegment = $this->subscriberSegment; $subscriberSegment = $this->subscriberSegment;
$subscriberSegment->status = Subscriber::STATUS_UNSUBSCRIBED; $subscriberSegment->status = SubscriberEntity::STATUS_UNSUBSCRIBED;
$subscriberSegment->save(); $subscriberSegment->save();
$this->entityManager->refresh($this->sendingQueueEntity); $this->entityManager->refresh($this->sendingQueueEntity);
$sendingQueueWorker->process(); $sendingQueueWorker->process();
@@ -1132,7 +1134,7 @@ class SendingQueueTest extends \MailPoetTest {
// newsletter is not sent to inactive subscriber // newsletter is not sent to inactive subscriber
$subscriber = $this->subscriber; $subscriber = $this->subscriber;
$subscriber->setStatus(Subscriber::STATUS_INACTIVE); $subscriber->setStatus(SubscriberEntity::STATUS_INACTIVE);
$this->entityManager->flush(); $this->entityManager->flush();
$this->entityManager->refresh($this->sendingQueueEntity); $this->entityManager->refresh($this->sendingQueueEntity);
$sendingQueueWorker->process(); $sendingQueueWorker->process();
@@ -1213,7 +1215,7 @@ class SendingQueueTest extends \MailPoetTest {
// newsletter is sent and hash remains intact // newsletter is sent and hash remains intact
$updatedNewsletter = Newsletter::findOne($this->newsletter->id); $updatedNewsletter = Newsletter::findOne($this->newsletter->id);
$this->assertInstanceOf(Newsletter::class, $updatedNewsletter); $this->assertInstanceOf(Newsletter::class, $updatedNewsletter);
verify($updatedNewsletter->status)->equals(Newsletter::STATUS_SENT); verify($updatedNewsletter->status)->equals(NewsletterEntity::STATUS_SENT);
verify($updatedNewsletter->hash)->equals($this->newsletter->hash); verify($updatedNewsletter->hash)->equals($this->newsletter->hash);
} }
@@ -1427,7 +1429,7 @@ class SendingQueueTest extends \MailPoetTest {
$subscriber->setEmail($email); $subscriber->setEmail($email);
$subscriber->setFirstName($firstName); $subscriber->setFirstName($firstName);
$subscriber->setLastName($lastName); $subscriber->setLastName($lastName);
$subscriber->setStatus(Subscriber::STATUS_SUBSCRIBED); $subscriber->setStatus(SubscriberEntity::STATUS_SUBSCRIBED);
$subscriber->setSource('administrator'); $subscriber->setSource('administrator');
$this->entityManager->persist($subscriber); $this->entityManager->persist($subscriber);
$this->entityManager->flush(); $this->entityManager->flush();