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

Replace Segment model with Doctrine in SendingQueueTest

Browse Source 
[MAILPOET-5737]
This commit is contained in:
Rodrigo Primo
2023-11-22 11:49:30 -03:00
committed by Aschepikov
parent abd19a6e6e
commit a9952cf394
1 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,7 +32,6 @@ use MailPoet\Mailer\MailerLog;
use MailPoet\Mailer\SubscriberError; use MailPoet\Mailer\SubscriberError;
use MailPoet\Models\Newsletter; use MailPoet\Models\Newsletter;
use MailPoet\Models\NewsletterSegment; use MailPoet\Models\NewsletterSegment;
use MailPoet\Models\Segment;
use MailPoet\Models\SendingQueue; use MailPoet\Models\SendingQueue;
use MailPoet\Models\StatisticsNewsletters; use MailPoet\Models\StatisticsNewsletters;
use MailPoet\Models\Subscriber; use MailPoet\Models\Subscriber;
@@ -68,6 +67,7 @@ class SendingQueueTest extends \MailPoetTest {
public $newsletterSegment; public $newsletterSegment;
public $newsletter; public $newsletter;
public $subscriberSegment; public $subscriberSegment;
/** @var SegmentEntity */
public $segment; public $segment;
/** @var SubscriberEntity */ /** @var SubscriberEntity */
public $subscriber; public $subscriber;
@@ -109,9 +109,6 @@ class SendingQueueTest extends \MailPoetTest {
/** NewsletterEntity */ /** NewsletterEntity */
private $newsletterEntity; private $newsletterEntity;
/** @var SegmentEntity */
private $segmentEntity;
public function _before() { public function _before() {
parent::_before(); parent::_before();
$wpUsers = get_users(); $wpUsers = get_users();
@@ -123,15 +120,8 @@ class SendingQueueTest extends \MailPoetTest {
$this->newslettersRepository = $this->diContainer->get(NewslettersRepository::class); $this->newslettersRepository = $this->diContainer->get(NewslettersRepository::class);
$this->scheduledTaskSubscribersRepository = $this->diContainer->get(ScheduledTaskSubscribersRepository::class); $this->scheduledTaskSubscribersRepository = $this->diContainer->get(ScheduledTaskSubscribersRepository::class);
$this->segmentsRepository = $this->diContainer->get(SegmentsRepository::class); $this->segmentsRepository = $this->diContainer->get(SegmentsRepository::class);
$this->segment = (new SegmentFactory())->withName('segment')->create();
/** @var Segment $segment */ $this->subscriber = $this->createSubscriber('john@doe.com', 'John', 'Doe', [$this->segment]);
$this->segment = Segment::create();
$this->segment->name = 'segment';
$this->segment->save();
$segmentEntity = $this->segmentsRepository->findOneById($this->segment->id);
$this->assertInstanceOf(SegmentEntity::class, $segmentEntity);
$this->segmentEntity = $segmentEntity;
$this->subscriber = $this->createSubscriber('john@doe.com', 'John', 'Doe', [$this->segmentEntity]);
/** @var Newsletter $newsletter */ /** @var Newsletter $newsletter */
$newsletter = Newsletter::create(); $newsletter = Newsletter::create();
@@ -150,7 +140,7 @@ class SendingQueueTest extends \MailPoetTest {
$newsletterSegment = NewsletterSegment::create(); $newsletterSegment = NewsletterSegment::create();
$this->newsletterSegment = $newsletterSegment; $this->newsletterSegment = $newsletterSegment;
$this->newsletterSegment->newsletterId = $this->newsletter->id; $this->newsletterSegment->newsletterId = $this->newsletter->id;
$this->newsletterSegment->segmentId = (int)$this->segment->id; $this->newsletterSegment->segmentId = (int)$this->segment->getId();
$this->newsletterSegment->save(); $this->newsletterSegment->save();
$this->sendingQueue = $this->createQueueWithTask($this->newsletterEntity); $this->sendingQueue = $this->createQueueWithTask($this->newsletterEntity);
@@ -1342,7 +1332,7 @@ class SendingQueueTest extends \MailPoetTest {
public function testCampaignIdsAreTheSameForDifferentSubscribers() { public function testCampaignIdsAreTheSameForDifferentSubscribers() {
$mailerTaskCampaignIds = []; $mailerTaskCampaignIds = [];
$secondSubscriber = $this->createSubscriber('sub2@example.com', 'Subscriber', 'Two', [$this->segmentEntity]); $secondSubscriber = $this->createSubscriber('sub2@example.com', 'Subscriber', 'Two', [$this->segment]);
$this->scheduledTaskSubscribersRepository->setSubscribers( $this->scheduledTaskSubscribersRepository->setSubscribers(
$this->scheduledTask, $this->scheduledTask,
[$this->subscriber->getId(), $secondSubscriber->getId()] [$this->subscriber->getId(), $secondSubscriber->getId()]