diff --git a/tests/integration/Cron/Workers/SendingQueue/SendingQueueTest.php b/tests/integration/Cron/Workers/SendingQueue/SendingQueueTest.php index 78a35669ab..4c6928908c 100644 --- a/tests/integration/Cron/Workers/SendingQueue/SendingQueueTest.php +++ b/tests/integration/Cron/Workers/SendingQueue/SendingQueueTest.php @@ -14,11 +14,11 @@ use MailPoet\Cron\Workers\SendingQueue\Tasks\Newsletter as NewsletterTask; use MailPoet\Cron\Workers\StatsNotifications\Scheduler as StatsNotificationsScheduler; use MailPoet\DI\ContainerWrapper; use MailPoet\Entities\NewsletterEntity; +use MailPoet\Entities\NewsletterPostEntity; use MailPoet\Logging\LoggerFactory; use MailPoet\Mailer\MailerLog; use MailPoet\Models\Newsletter; use MailPoet\Models\NewsletterLink; -use MailPoet\Models\NewsletterPost; use MailPoet\Models\NewsletterSegment; use MailPoet\Models\ScheduledTask; use MailPoet\Models\ScheduledTaskSubscriber; @@ -949,7 +949,7 @@ class SendingQueueTest extends \MailPoetTest { $this->diContainer->get(SettingsRepository::class)->truncate(); ORM::raw_execute('TRUNCATE ' . Newsletter::$_table); ORM::raw_execute('TRUNCATE ' . NewsletterLink::$_table); - ORM::raw_execute('TRUNCATE ' . NewsletterPost::$_table); + $this->truncateEntity(NewsletterPostEntity::class); ORM::raw_execute('TRUNCATE ' . NewsletterSegment::$_table); ORM::raw_execute('TRUNCATE ' . StatisticsNewsletters::$_table); } diff --git a/tests/integration/Cron/Workers/SendingQueue/Tasks/NewsletterTest.php b/tests/integration/Cron/Workers/SendingQueue/Tasks/NewsletterTest.php index 8314129970..cfb5a4eb84 100644 --- a/tests/integration/Cron/Workers/SendingQueue/Tasks/NewsletterTest.php +++ b/tests/integration/Cron/Workers/SendingQueue/Tasks/NewsletterTest.php @@ -8,11 +8,11 @@ use Codeception\Util\Fixtures; use Helper\WordPressHooks as WPHooksHelper; use MailPoet\Cron\Workers\SendingQueue\Tasks\Newsletter as NewsletterTask; use MailPoet\Cron\Workers\SendingQueue\Tasks\Posts as PostsTask; +use MailPoet\Entities\NewsletterPostEntity; use MailPoet\Logging\LoggerFactory; use MailPoet\Mailer\MailerLog; use MailPoet\Models\Newsletter; use MailPoet\Models\NewsletterLink; -use MailPoet\Models\NewsletterPost; use MailPoet\Models\NewsletterSegment; use MailPoet\Models\ScheduledTask; use MailPoet\Models\SendingQueue; @@ -460,6 +460,6 @@ class NewsletterTest extends \MailPoetTest { ORM::raw_execute('TRUNCATE ' . ScheduledTask::$_table); ORM::raw_execute('TRUNCATE ' . SendingQueue::$_table); ORM::raw_execute('TRUNCATE ' . NewsletterLink::$_table); - ORM::raw_execute('TRUNCATE ' . NewsletterPost::$_table); + $this->truncateEntity(NewsletterPostEntity::class); } } diff --git a/tests/integration/Cron/Workers/SendingQueue/Tasks/PostsTest.php b/tests/integration/Cron/Workers/SendingQueue/Tasks/PostsTest.php index 604d7015c5..d94f57b7fd 100644 --- a/tests/integration/Cron/Workers/SendingQueue/Tasks/PostsTest.php +++ b/tests/integration/Cron/Workers/SendingQueue/Tasks/PostsTest.php @@ -3,9 +3,8 @@ namespace MailPoet\Test\Cron\Workers\SendingQueue\Tasks; use MailPoet\Cron\Workers\SendingQueue\Tasks\Posts as PostsTask; +use MailPoet\Entities\NewsletterPostEntity; use MailPoet\Models\Newsletter; -use MailPoet\Models\NewsletterPost; -use MailPoetVendor\Idiorm\ORM; class PostsTest extends \MailPoetTest { @@ -61,6 +60,6 @@ class PostsTest extends \MailPoetTest { } public function _after() { - ORM::raw_execute('TRUNCATE ' . NewsletterPost::$_table); + $this->truncateEntity(NewsletterPostEntity::class); } } diff --git a/tests/integration/Newsletter/Scheduler/AutomaticEmailTest.php b/tests/integration/Newsletter/Scheduler/AutomaticEmailTest.php index 54a52aaf4a..c565a182e8 100644 --- a/tests/integration/Newsletter/Scheduler/AutomaticEmailTest.php +++ b/tests/integration/Newsletter/Scheduler/AutomaticEmailTest.php @@ -3,10 +3,10 @@ namespace MailPoet\Newsletter\Scheduler; use Codeception\Util\Fixtures; +use MailPoet\Entities\NewsletterPostEntity; use MailPoet\Models\Newsletter; use MailPoet\Models\NewsletterOption; use MailPoet\Models\NewsletterOptionField; -use MailPoet\Models\NewsletterPost; use MailPoet\Models\ScheduledTask; use MailPoet\Models\ScheduledTaskSubscriber; use MailPoet\Models\SendingQueue; @@ -223,7 +223,7 @@ class AutomaticEmailTest extends \MailPoetTest { ORM::raw_execute('TRUNCATE ' . Newsletter::$_table); ORM::raw_execute('TRUNCATE ' . NewsletterOption::$_table); ORM::raw_execute('TRUNCATE ' . NewsletterOptionField::$_table); - ORM::raw_execute('TRUNCATE ' . NewsletterPost::$_table); + $this->truncateEntity(NewsletterPostEntity::class); ORM::raw_execute('TRUNCATE ' . ScheduledTask::$_table); ORM::raw_execute('TRUNCATE ' . ScheduledTaskSubscriber::$_table); ORM::raw_execute('TRUNCATE ' . SendingQueue::$_table); diff --git a/tests/integration/Newsletter/Scheduler/SchedulerTest.php b/tests/integration/Newsletter/Scheduler/SchedulerTest.php index c0c1ce27f6..44c6481bd2 100644 --- a/tests/integration/Newsletter/Scheduler/SchedulerTest.php +++ b/tests/integration/Newsletter/Scheduler/SchedulerTest.php @@ -2,10 +2,10 @@ namespace MailPoet\Test\Newsletter\Scheduler; +use MailPoet\Entities\NewsletterPostEntity; use MailPoet\Models\Newsletter; use MailPoet\Models\NewsletterOption; use MailPoet\Models\NewsletterOptionField; -use MailPoet\Models\NewsletterPost; use MailPoet\Models\ScheduledTask; use MailPoet\Models\ScheduledTaskSubscriber; use MailPoet\Models\SendingQueue; @@ -101,7 +101,7 @@ class SchedulerTest extends \MailPoetTest { ORM::raw_execute('TRUNCATE ' . Newsletter::$_table); ORM::raw_execute('TRUNCATE ' . NewsletterOption::$_table); ORM::raw_execute('TRUNCATE ' . NewsletterOptionField::$_table); - ORM::raw_execute('TRUNCATE ' . NewsletterPost::$_table); + $this->truncateEntity(NewsletterPostEntity::class); ORM::raw_execute('TRUNCATE ' . ScheduledTask::$_table); ORM::raw_execute('TRUNCATE ' . ScheduledTaskSubscriber::$_table); ORM::raw_execute('TRUNCATE ' . SendingQueue::$_table);