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

Remove old Setting model from integration tests

Browse Source 
[MAILPOET-2436]
This commit is contained in:
Jan Jakeš
2019-10-29 18:14:26 +01:00
committed by Jack Kitterhing
parent 7bddf631c5
commit 40c87d50fe
34 changed files with 134 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/integration/API/JSON/v1/SendingQueueTest.php
View File

@ -9,8 +9,8 @@ use MailPoet\Models\NewsletterOption;
use MailPoet\Models\NewsletterOptionField;
use MailPoet\Models\ScheduledTask;
use MailPoet\Models\SendingQueue as SendingQueueModel;
use MailPoet\Models\Setting;
use MailPoet\Settings\SettingsController;
use MailPoet\Settings\SettingsRepository;
use MailPoet\Tasks\Sending;
class SendingQueueTest extends \MailPoetTest {
@ -118,7 +118,7 @@ class SendingQueueTest extends \MailPoetTest {
\ORM::raw_execute('TRUNCATE ' . Newsletter::$_table);
\ORM::raw_execute('TRUNCATE ' . NewsletterOption::$_table);
\ORM::raw_execute('TRUNCATE ' . NewsletterOptionField::$_table);
\ORM::raw_execute('TRUNCATE ' . Setting::$_table);
$this->di_container->get(SettingsRepository::class)->truncate();
\ORM::raw_execute('TRUNCATE ' . SendingQueueModel::$_table);
\ORM::raw_execute('TRUNCATE ' . ScheduledTask::$_table);
}

6
tests/integration/API/JSON/v1/SettingsTest.php
View File

@ -9,10 +9,10 @@ use MailPoet\API\JSON\Response as APIResponse;
use MailPoet\API\JSON\v1\Settings;
use MailPoet\Cron\Workers\InactiveSubscribers;
use MailPoet\Models\ScheduledTask;
use MailPoet\Models\Setting;
use MailPoet\Services\AuthorizedEmailsController;
use MailPoet\Services\Bridge;
use MailPoet\Settings\SettingsController;
use MailPoet\Settings\SettingsRepository;
class SettingsTest extends \MailPoetTest {
@ -41,7 +41,7 @@ class SettingsTest extends \MailPoetTest {
expect($response->data)->notEmpty();
expect($response->data['some']['setting']['key'])->true();
Setting::deleteMany();
$this->di_container->get(SettingsRepository::class)->truncate();
$this->settings->resetCache();
$response = $this->endpoint->get();
expect($response->status)->equals(APIResponse::STATUS_OK);
@ -96,6 +96,6 @@ class SettingsTest extends \MailPoetTest {
}
function _after() {
\ORM::forTable(Setting::$_table)->deleteMany();
$this->di_container->get(SettingsRepository::class)->truncate();
}
}

4
tests/integration/API/JSON/v1/SetupTest.php
View File

@ -9,9 +9,9 @@ use MailPoet\API\JSON\v1\Setup;
use MailPoet\Config\Activator;
use MailPoet\Config\Populator;
use MailPoet\Features\FeaturesController;
use MailPoet\Models\Setting;
use MailPoet\Referrals\ReferralDetector;
use MailPoet\Settings\SettingsController;
use MailPoet\Settings\SettingsRepository;
use MailPoet\Subscription\Captcha;
use MailPoet\WooCommerce\TransactionalEmails;
use MailPoet\WP\Functions as WPFunctions;
@ -57,6 +57,6 @@ class SetupTest extends \MailPoetTest {
}
function _after() {
Setting::deleteMany();
$this->di_container->get(SettingsRepository::class)->truncate();
}
}

4
tests/integration/API/JSON/v1/SubscribersTest.php
View File

@ -17,12 +17,12 @@ use MailPoet\Models\NewsletterOption;
use MailPoet\Models\NewsletterOptionField;
use MailPoet\Models\Segment;
use MailPoet\Models\SendingQueue;
use MailPoet\Models\Setting;
use MailPoet\Models\Subscriber;
use MailPoet\Models\SubscriberIP;
use MailPoet\Models\SubscriberSegment;
use MailPoet\Segments\SubscribersListings;
use MailPoet\Settings\SettingsController;
use MailPoet\Settings\SettingsRepository;
use MailPoet\Subscribers\ConfirmationEmailMailer;
use MailPoet\Subscribers\LinkTokens;
use MailPoet\Subscribers\RequiredCustomFieldValidator;
@ -819,6 +819,6 @@ class SubscribersTest extends \MailPoetTest {
\ORM::raw_execute('TRUNCATE ' . SubscriberSegment::$_table);
\ORM::raw_execute('TRUNCATE ' . SubscriberIP::$_table);
\ORM::raw_execute('TRUNCATE ' . CustomField::$_table);
\ORM::raw_execute('TRUNCATE ' . Setting::$_table);
$this->di_container->get(SettingsRepository::class)->truncate();
}
}