diff --git a/tests/integration/API/JSON/APITest.php b/tests/integration/API/JSON/APITest.php index 80f7c5d0f7..5af2765384 100644 --- a/tests/integration/API/JSON/APITest.php +++ b/tests/integration/API/JSON/APITest.php @@ -27,6 +27,7 @@ class APITest extends \MailPoetTest { private $container; function _before() { + parent::_before(); // create WP user $this->wp_user_id = null; $wp_user_id = wp_create_user('WP User', 'pass', 'wp_user@mailpoet.com'); diff --git a/tests/integration/API/JSON/v1/CustomFieldsTest.php b/tests/integration/API/JSON/v1/CustomFieldsTest.php index 516f472a37..2974d06c96 100644 --- a/tests/integration/API/JSON/v1/CustomFieldsTest.php +++ b/tests/integration/API/JSON/v1/CustomFieldsTest.php @@ -52,6 +52,7 @@ class CustomFieldsTest extends \MailPoetTest { ); function _before() { + parent::_before(); foreach($this->custom_fields as $custom_field) { CustomField::createOrUpdate($custom_field); } diff --git a/tests/integration/API/JSON/v1/FormsTest.php b/tests/integration/API/JSON/v1/FormsTest.php index 6a9cf52057..92bcef8fc5 100644 --- a/tests/integration/API/JSON/v1/FormsTest.php +++ b/tests/integration/API/JSON/v1/FormsTest.php @@ -13,6 +13,7 @@ class FormsTest extends \MailPoetTest { private $endpoint; function _before() { + parent::_before(); $this->endpoint = ContainerWrapper::getInstance()->get(Forms::class); $this->form_1 = Form::createOrUpdate(array('name' => 'Form 1')); $this->form_2 = Form::createOrUpdate(array('name' => 'Form 2')); diff --git a/tests/integration/API/JSON/v1/NewsletterTemplatesTest.php b/tests/integration/API/JSON/v1/NewsletterTemplatesTest.php index ed35a39b7d..192329041b 100644 --- a/tests/integration/API/JSON/v1/NewsletterTemplatesTest.php +++ b/tests/integration/API/JSON/v1/NewsletterTemplatesTest.php @@ -7,6 +7,7 @@ use MailPoet\Models\NewsletterTemplate; class NewsletterTemplatesTest extends \MailPoetTest { function _before() { + parent::_before(); NewsletterTemplate::deleteMany(); NewsletterTemplate::createOrUpdate(array( 'name' => 'Template #1', diff --git a/tests/integration/API/JSON/v1/NewslettersTest.php b/tests/integration/API/JSON/v1/NewslettersTest.php index 33316827b0..a2424df361 100644 --- a/tests/integration/API/JSON/v1/NewslettersTest.php +++ b/tests/integration/API/JSON/v1/NewslettersTest.php @@ -31,6 +31,7 @@ class NewslettersTest extends \MailPoetTest { private $endpoint; function _before() { + parent::_before(); $this->endpoint = ContainerWrapper::getInstance()->get(Newsletters::class); $this->newsletter = Newsletter::createOrUpdate( array( diff --git a/tests/integration/API/JSON/v1/SegmentsTest.php b/tests/integration/API/JSON/v1/SegmentsTest.php index 39b201d175..c1fdd09eba 100644 --- a/tests/integration/API/JSON/v1/SegmentsTest.php +++ b/tests/integration/API/JSON/v1/SegmentsTest.php @@ -14,6 +14,7 @@ class SegmentsTest extends \MailPoetTest { private $endpoint; function _before() { + parent::_before(); $this->endpoint = ContainerWrapper::getInstance()->get(Segments::class); $this->segment_1 = Segment::createOrUpdate(array('name' => 'Segment 1', 'type' => 'default')); $this->segment_2 = Segment::createOrUpdate(array('name' => 'Segment 2', 'type' => 'default')); diff --git a/tests/integration/API/JSON/v1/SendingQueueTest.php b/tests/integration/API/JSON/v1/SendingQueueTest.php index d4af0b2175..f8e499ca13 100644 --- a/tests/integration/API/JSON/v1/SendingQueueTest.php +++ b/tests/integration/API/JSON/v1/SendingQueueTest.php @@ -14,6 +14,7 @@ use MailPoet\Tasks\Sending; class SendingQueueTest extends \MailPoetTest { function _before() { + parent::_before(); $this->newsletter = Newsletter::createOrUpdate( array( 'subject' => 'My Standard Newsletter', diff --git a/tests/integration/API/JSON/v1/ServicesTest.php b/tests/integration/API/JSON/v1/ServicesTest.php index f6a37fd188..ff32c5bd12 100644 --- a/tests/integration/API/JSON/v1/ServicesTest.php +++ b/tests/integration/API/JSON/v1/ServicesTest.php @@ -11,6 +11,7 @@ use MailPoet\Services\Bridge; class ServicesTest extends \MailPoetTest { function _before() { + parent::_before(); $this->services_endpoint = new Services(); $this->data = array('key' => '1234567890abcdef'); } diff --git a/tests/integration/API/JSON/v1/SettingsTest.php b/tests/integration/API/JSON/v1/SettingsTest.php index 26d7bb2d20..3d037360bc 100644 --- a/tests/integration/API/JSON/v1/SettingsTest.php +++ b/tests/integration/API/JSON/v1/SettingsTest.php @@ -8,6 +8,7 @@ use MailPoet\Models\Setting; class SettingsTest extends \MailPoetTest { function _before() { + parent::_before(); Setting::setValue('some.setting.key', true); } diff --git a/tests/integration/API/JSON/v1/SetupTest.php b/tests/integration/API/JSON/v1/SetupTest.php index 296ad98279..41d532a23d 100644 --- a/tests/integration/API/JSON/v1/SetupTest.php +++ b/tests/integration/API/JSON/v1/SetupTest.php @@ -10,6 +10,7 @@ use MailPoet\API\JSON\Response as APIResponse; class SetupTest extends \MailPoetTest { function _before() { + parent::_before(); Setting::setValue('signup_confirmation.enabled', false); } diff --git a/tests/integration/API/JSON/v1/SubscribersTest.php b/tests/integration/API/JSON/v1/SubscribersTest.php index 1797e65d71..cef043b710 100644 --- a/tests/integration/API/JSON/v1/SubscribersTest.php +++ b/tests/integration/API/JSON/v1/SubscribersTest.php @@ -26,6 +26,7 @@ class SubscribersTest extends \MailPoetTest { private $endpoint; function _before() { + parent::_before(); $this->cleanup(); $this->endpoint = ContainerWrapper::getInstance()->get(Subscribers::class); $obfuscator = new FieldNameObfuscator(); diff --git a/tests/integration/Config/CapabilitiesTest.php b/tests/integration/Config/CapabilitiesTest.php index 09a0431c88..9b14f7b3d0 100644 --- a/tests/integration/Config/CapabilitiesTest.php +++ b/tests/integration/Config/CapabilitiesTest.php @@ -12,6 +12,7 @@ use MailPoet\WP\Functions as WPFunctions; class CapabilitiesTest extends \MailPoetTest { function _before() { + parent::_before(); $renderer = new Renderer(); $this->caps = new Capabilities($renderer); } diff --git a/tests/integration/Config/DatabaseTest.php b/tests/integration/Config/DatabaseTest.php index 880df421d1..4b441efafa 100644 --- a/tests/integration/Config/DatabaseTest.php +++ b/tests/integration/Config/DatabaseTest.php @@ -14,6 +14,7 @@ class DatabaseTest extends \MailPoetTest { } function _before() { + parent::_before(); \ORM::set_db(null); } diff --git a/tests/integration/Config/EnvTest.php b/tests/integration/Config/EnvTest.php index d5eb83537e..4022746f9c 100644 --- a/tests/integration/Config/EnvTest.php +++ b/tests/integration/Config/EnvTest.php @@ -5,6 +5,7 @@ use MailPoet\Config\Env; class EnvTest extends \MailPoetTest { function _before() { + parent::_before(); // Back up original environment values $this->file = Env::$file; $this->version = Env::$version; diff --git a/tests/integration/Config/InstallerTest.php b/tests/integration/Config/InstallerTest.php index e6f261fb97..3c298b1666 100644 --- a/tests/integration/Config/InstallerTest.php +++ b/tests/integration/Config/InstallerTest.php @@ -8,6 +8,7 @@ use MailPoet\Config\Installer; class InstallerTest extends \MailPoetTest { function _before() { + parent::_before(); $this->slug = 'some-plugin'; $this->installer = new Installer( diff --git a/tests/integration/Config/MP2MigratorTest.php b/tests/integration/Config/MP2MigratorTest.php index 338a7a85e1..c22fefd9e0 100644 --- a/tests/integration/Config/MP2MigratorTest.php +++ b/tests/integration/Config/MP2MigratorTest.php @@ -14,6 +14,7 @@ use Helper\Database; class MP2MigratorTest extends \MailPoetTest { public function _before() { + parent::_before(); $this->MP2Migrator = new MP2Migrator(); } diff --git a/tests/integration/Config/MigratorTest.php b/tests/integration/Config/MigratorTest.php index 3a00e5c15b..da4318eb53 100644 --- a/tests/integration/Config/MigratorTest.php +++ b/tests/integration/Config/MigratorTest.php @@ -5,6 +5,7 @@ use MailPoet\Config\Migrator; class MigratorTest extends \MailPoetTest { function _before() { + parent::_before(); $this->migrator = new Migrator(); } diff --git a/tests/integration/Config/RendererTest.php b/tests/integration/Config/RendererTest.php index 772227787a..7f8ae98426 100644 --- a/tests/integration/Config/RendererTest.php +++ b/tests/integration/Config/RendererTest.php @@ -8,6 +8,7 @@ use MailPoet\Config\Renderer; class RendererTest extends \MailPoetTest { function _before() { + parent::_before(); $this->renderer = new Renderer($caching = false, $debugging = false); } diff --git a/tests/integration/Config/ServicesCheckerTest.php b/tests/integration/Config/ServicesCheckerTest.php index 68877f31df..b5cebc3d98 100644 --- a/tests/integration/Config/ServicesCheckerTest.php +++ b/tests/integration/Config/ServicesCheckerTest.php @@ -8,6 +8,7 @@ use MailPoet\Services\Bridge; class ServicesCheckerTest extends \MailPoetTest { function _before() { + parent::_before(); $this->setMailPoetSendingMethod(); $this->fillPremiumKey(); $this->services_checker = new ServicesChecker(); diff --git a/tests/integration/Config/ShortcodesTest.php b/tests/integration/Config/ShortcodesTest.php index eb00321716..fdcf8bc11d 100644 --- a/tests/integration/Config/ShortcodesTest.php +++ b/tests/integration/Config/ShortcodesTest.php @@ -15,6 +15,7 @@ use MailPoet\WP\Functions as WPFunctions; class ShortcodesTest extends \MailPoetTest { function _before() { + parent::_before(); $newsletter = Newsletter::create(); $newsletter->type = Newsletter::TYPE_STANDARD; $newsletter->status = Newsletter::STATUS_SENT; diff --git a/tests/integration/Config/UpdaterTest.php b/tests/integration/Config/UpdaterTest.php index 7fa58fadcd..346c97a047 100644 --- a/tests/integration/Config/UpdaterTest.php +++ b/tests/integration/Config/UpdaterTest.php @@ -7,6 +7,7 @@ use MailPoet\Config\Updater; class UpdaterTest extends \MailPoetTest { function _before() { + parent::_before(); $this->plugin_name = 'some-plugin/some-plugin.php'; $this->slug = 'some-plugin'; $this->version = '0.1'; diff --git a/tests/integration/Cron/CronHelperTest.php b/tests/integration/Cron/CronHelperTest.php index b881314de8..ff4d5de289 100644 --- a/tests/integration/Cron/CronHelperTest.php +++ b/tests/integration/Cron/CronHelperTest.php @@ -11,6 +11,7 @@ use MailPoet\WP\Functions as WPFunctions; class CronHelperTest extends \MailPoetTest { function _before() { + parent::_before(); Setting::setValue('db_version', MAILPOET_VERSION); // Disable cron trigger to not run tasks like migration when pinging the daemon Setting::setValue('cron_trigger', array( diff --git a/tests/integration/Cron/CronTriggerTest.php b/tests/integration/Cron/CronTriggerTest.php index a3f2231e6f..9c1d8ab46f 100644 --- a/tests/integration/Cron/CronTriggerTest.php +++ b/tests/integration/Cron/CronTriggerTest.php @@ -9,6 +9,7 @@ require_once('CronTriggerMockMethodWithException.php'); class CronTriggerTest extends \MailPoetTest { function _before() { + parent::_before(); $this->cron_trigger = new CronTrigger(); } diff --git a/tests/integration/Cron/SupervisorTest.php b/tests/integration/Cron/SupervisorTest.php index 23bd8f6e5d..51017a7991 100644 --- a/tests/integration/Cron/SupervisorTest.php +++ b/tests/integration/Cron/SupervisorTest.php @@ -7,6 +7,7 @@ use MailPoet\Models\Setting; class SupervisorTest extends \MailPoetTest { function _before() { + parent::_before(); // cron trigger is by default set to 'WordPress'; when it runs and does not // detect any queues to process, it deletes the daemon setting, so Supervisor and // CronHelper's getDaemon() methods do not work. for that matter, we need to set diff --git a/tests/integration/Cron/Triggers/MailPoetTest.php b/tests/integration/Cron/Triggers/MailPoetTest.php index c5c7bf6663..745cf63769 100644 --- a/tests/integration/Cron/Triggers/MailPoetTest.php +++ b/tests/integration/Cron/Triggers/MailPoetTest.php @@ -8,6 +8,7 @@ use MailPoet\Models\Setting; class MailPoetTest extends \MailPoetTest { function _before() { + parent::_before(); // cron trigger is by default set to 'WordPress'; when it runs and does not // detect any queues to process, it deletes the daemon setting, so Supervisor that's // called by the MailPoet cron trigger does not work. for that matter, we need to set diff --git a/tests/integration/Cron/Triggers/WordPressTest.php b/tests/integration/Cron/Triggers/WordPressTest.php index cdab7f486b..ce2736ea82 100644 --- a/tests/integration/Cron/Triggers/WordPressTest.php +++ b/tests/integration/Cron/Triggers/WordPressTest.php @@ -15,6 +15,7 @@ use MailPoet\Cron\Workers\SendingQueue\Migration as MigrationWorker; class WordPressTest extends \MailPoetTest { function _before() { + parent::_before(); // cron trigger is by default set to 'WordPress'; when it runs and does not // detect any queues to process, it deletes the daemon setting, so Supervisor that's // called by the MailPoet cron trigger does not work. for that matter, we need to set diff --git a/tests/integration/Cron/Workers/BounceTest.php b/tests/integration/Cron/Workers/BounceTest.php index a88750ab1a..c4a896fde4 100644 --- a/tests/integration/Cron/Workers/BounceTest.php +++ b/tests/integration/Cron/Workers/BounceTest.php @@ -15,6 +15,7 @@ use MailPoet\Cron\Workers\Bounce\BounceTestMockAPI as MockAPI; class BounceTest extends \MailPoetTest { function _before() { + parent::_before(); $this->emails = array( 'soft_bounce@example.com', 'hard_bounce@example.com', diff --git a/tests/integration/Cron/Workers/KeyCheck/KeyCheckWorkerTest.php b/tests/integration/Cron/Workers/KeyCheck/KeyCheckWorkerTest.php index dfa0f89af9..428427088a 100644 --- a/tests/integration/Cron/Workers/KeyCheck/KeyCheckWorkerTest.php +++ b/tests/integration/Cron/Workers/KeyCheck/KeyCheckWorkerTest.php @@ -13,6 +13,7 @@ use MailPoet\Cron\Workers\KeyCheck\KeyCheckWorkerMockImplementation as MockKeyCh class KeyCheckWorkerTest extends \MailPoetTest { function _before() { + parent::_before(); $this->worker = new MockKeyCheckWorker(); } @@ -70,4 +71,4 @@ class KeyCheckWorkerTest extends \MailPoetTest { \ORM::raw_execute('TRUNCATE ' . Setting::$_table); \ORM::raw_execute('TRUNCATE ' . ScheduledTask::$_table); } -} \ No newline at end of file +} diff --git a/tests/integration/Cron/Workers/KeyCheck/PremiumKeyCheckTest.php b/tests/integration/Cron/Workers/KeyCheck/PremiumKeyCheckTest.php index 6fd062c70a..a4c25d73ae 100644 --- a/tests/integration/Cron/Workers/KeyCheck/PremiumKeyCheckTest.php +++ b/tests/integration/Cron/Workers/KeyCheck/PremiumKeyCheckTest.php @@ -8,6 +8,7 @@ use MailPoet\Services\Bridge; class PremiumKeyCheckTest extends \MailPoetTest { function _before() { + parent::_before(); $this->premium_key = '123457890abcdef'; $this->worker = new PremiumKeyCheck(microtime(true)); } diff --git a/tests/integration/Cron/Workers/KeyCheck/SendingServiceKeyCheckTest.php b/tests/integration/Cron/Workers/KeyCheck/SendingServiceKeyCheckTest.php index 507d39d425..33eb5b23f9 100644 --- a/tests/integration/Cron/Workers/KeyCheck/SendingServiceKeyCheckTest.php +++ b/tests/integration/Cron/Workers/KeyCheck/SendingServiceKeyCheckTest.php @@ -10,6 +10,7 @@ use MailPoet\Services\Bridge; class SendingServiceKeyCheckTest extends \MailPoetTest { function _before() { + parent::_before(); $this->mss_key = 'some_key'; $this->worker = new SendingServiceKeyCheck(microtime(true)); } diff --git a/tests/integration/Cron/Workers/SendingQueue/MigrationTest.php b/tests/integration/Cron/Workers/SendingQueue/MigrationTest.php index 08cd42c1a5..361a6609eb 100644 --- a/tests/integration/Cron/Workers/SendingQueue/MigrationTest.php +++ b/tests/integration/Cron/Workers/SendingQueue/MigrationTest.php @@ -16,6 +16,7 @@ use MailPoet\WP\Functions as WPFunctions; class MigrationTest extends \MailPoetTest { function _before() { + parent::_before(); // Alter table to test migration if(!Migration::checkUnmigratedColumnsExist()) { $this->downgradeTable(); diff --git a/tests/integration/Cron/Workers/SendingQueue/SendingErrorHandlerTest.php b/tests/integration/Cron/Workers/SendingQueue/SendingErrorHandlerTest.php index 08817e3801..a68fbbbbf5 100644 --- a/tests/integration/Cron/Workers/SendingQueue/SendingErrorHandlerTest.php +++ b/tests/integration/Cron/Workers/SendingQueue/SendingErrorHandlerTest.php @@ -14,6 +14,7 @@ class SendingErrorHandlerTest extends \MailPoetTest { private $error_handler; function _before() { + parent::_before(); $this->error_handler = new SendingErrorHandler(); } diff --git a/tests/integration/Cron/Workers/SendingQueue/SendingQueueTest.php b/tests/integration/Cron/Workers/SendingQueue/SendingQueueTest.php index c2738355e5..8a205edbbd 100644 --- a/tests/integration/Cron/Workers/SendingQueue/SendingQueueTest.php +++ b/tests/integration/Cron/Workers/SendingQueue/SendingQueueTest.php @@ -41,6 +41,7 @@ class SendingQueueTest extends \MailPoetTest { private $stats_notifications_worker; function _before() { + parent::_before(); $wp_users = get_users(); wp_set_current_user($wp_users[0]->ID); $populator = new Populator(); diff --git a/tests/integration/Cron/Workers/SendingQueue/Tasks/MailerTest.php b/tests/integration/Cron/Workers/SendingQueue/Tasks/MailerTest.php index ab2a462cbb..340287ee01 100644 --- a/tests/integration/Cron/Workers/SendingQueue/Tasks/MailerTest.php +++ b/tests/integration/Cron/Workers/SendingQueue/Tasks/MailerTest.php @@ -17,6 +17,7 @@ class MailerTest extends \MailPoetTest { public $sender; function _before() { + parent::_before(); $wp_users = get_users(); wp_set_current_user($wp_users[0]->ID); $populator = new Populator(); diff --git a/tests/integration/Cron/Workers/SendingQueue/Tasks/NewsletterTest.php b/tests/integration/Cron/Workers/SendingQueue/Tasks/NewsletterTest.php index 4a4e61ee29..8ec4daea3d 100644 --- a/tests/integration/Cron/Workers/SendingQueue/Tasks/NewsletterTest.php +++ b/tests/integration/Cron/Workers/SendingQueue/Tasks/NewsletterTest.php @@ -23,6 +23,7 @@ if(!defined('ABSPATH')) exit; class NewsletterTest extends \MailPoetTest { function _before() { + parent::_before(); $this->newsletter_task = new NewsletterTask(); $this->subscriber = Subscriber::create(); $this->subscriber->email = 'test@example.com'; @@ -388,4 +389,4 @@ class NewsletterTest extends \MailPoetTest { \ORM::raw_execute('TRUNCATE ' . NewsletterLink::$_table); \ORM::raw_execute('TRUNCATE ' . NewsletterPost::$_table); } -} \ No newline at end of file +} diff --git a/tests/integration/Cron/Workers/SendingQueue/Tasks/ShortcodesTest.php b/tests/integration/Cron/Workers/SendingQueue/Tasks/ShortcodesTest.php index e03a451777..f6b1527821 100644 --- a/tests/integration/Cron/Workers/SendingQueue/Tasks/ShortcodesTest.php +++ b/tests/integration/Cron/Workers/SendingQueue/Tasks/ShortcodesTest.php @@ -10,6 +10,7 @@ if(!defined('ABSPATH')) exit; class ShortcodesTest extends \MailPoetTest { function _before() { + parent::_before(); $this->WP_post = wp_insert_post( array( 'post_title' => 'Sample Post', @@ -51,4 +52,4 @@ class ShortcodesTest extends \MailPoetTest { \ORM::raw_execute('TRUNCATE ' . Newsletter::$_table); wp_delete_post($this->WP_post, true); } -} \ No newline at end of file +} diff --git a/tests/integration/Cron/Workers/SimpleWorkerTest.php b/tests/integration/Cron/Workers/SimpleWorkerTest.php index 114d8436ec..53aa04669d 100644 --- a/tests/integration/Cron/Workers/SimpleWorkerTest.php +++ b/tests/integration/Cron/Workers/SimpleWorkerTest.php @@ -14,6 +14,7 @@ use MailPoet\Cron\Workers\SimpleWorkerMockImplementation as MockSimpleWorker; class SimpleWorkerTest extends \MailPoetTest { function _before() { + parent::_before(); $this->worker = new MockSimpleWorker(); } diff --git a/tests/integration/Form/Block/SelectTest.php b/tests/integration/Form/Block/SelectTest.php index f509f02446..1045770212 100644 --- a/tests/integration/Form/Block/SelectTest.php +++ b/tests/integration/Form/Block/SelectTest.php @@ -6,6 +6,7 @@ use MailPoet\Models\Subscriber; class SelectTest extends \MailPoetTest { function _before() { + parent::_before(); $this->block = array( 'id' => 'status', 'type' => 'select', @@ -62,4 +63,4 @@ class SelectTest extends \MailPoetTest { $rendered = Select::render($this->block); expect($rendered)->notContains(Subscriber::STATUS_BOUNCED); } -} \ No newline at end of file +} diff --git a/tests/integration/Helpscout/BeaconTest.php b/tests/integration/Helpscout/BeaconTest.php index e917712bea..e63bda31f8 100644 --- a/tests/integration/Helpscout/BeaconTest.php +++ b/tests/integration/Helpscout/BeaconTest.php @@ -9,6 +9,7 @@ use MailPoet\WP\Functions as WPFunctions; class BeaconTest extends \MailPoetTest { function _before() { + parent::_before(); // create 4 users (1 confirmed, 1 subscribed, 1 unsubscribed, 1 bounced) Subscriber::createOrUpdate(array( 'email' => 'user1@mailpoet.com', diff --git a/tests/integration/Mailer/MailerTest.php b/tests/integration/Mailer/MailerTest.php index 57aee87a9f..83ec92a7dc 100644 --- a/tests/integration/Mailer/MailerTest.php +++ b/tests/integration/Mailer/MailerTest.php @@ -6,6 +6,7 @@ use MailPoet\Models\Setting; class MailerTest extends \MailPoetTest { function _before() { + parent::_before(); $this->available_mailer_methods = array( array( 'method' => 'AmazonSES', diff --git a/tests/integration/Mailer/Methods/AmazonSESTest.php b/tests/integration/Mailer/Methods/AmazonSESTest.php index 4a645f9dcd..664c251482 100644 --- a/tests/integration/Mailer/Methods/AmazonSESTest.php +++ b/tests/integration/Mailer/Methods/AmazonSESTest.php @@ -7,6 +7,7 @@ use MailPoet\Mailer\Methods\ErrorMappers\AmazonSESMapper; class AmazonSESTest extends \MailPoetTest { function _before() { + parent::_before(); $this->settings = array( 'method' => 'AmazonSES', 'access_key' => getenv('WP_TEST_MAILER_AMAZON_ACCESS') ? diff --git a/tests/integration/Mailer/Methods/ErrorMappers/AmazonSESMapperTest.php b/tests/integration/Mailer/Methods/ErrorMappers/AmazonSESMapperTest.php index b4c33515b9..f02d645e68 100644 --- a/tests/integration/Mailer/Methods/ErrorMappers/AmazonSESMapperTest.php +++ b/tests/integration/Mailer/Methods/ErrorMappers/AmazonSESMapperTest.php @@ -14,6 +14,7 @@ class AmazonSESMapperTest extends \MailPoetTest { private $response_data = []; function _before() { + parent::_before(); $this->mapper = new AmazonSESMapper(); $this->response_data = [ 'Error' => [ diff --git a/tests/integration/Mailer/Methods/ErrorMappers/MailPoetMapperTest.php b/tests/integration/Mailer/Methods/ErrorMappers/MailPoetMapperTest.php index 71f8bca3be..f6a1a285a7 100644 --- a/tests/integration/Mailer/Methods/ErrorMappers/MailPoetMapperTest.php +++ b/tests/integration/Mailer/Methods/ErrorMappers/MailPoetMapperTest.php @@ -14,6 +14,7 @@ class MailPoetMapperTest extends \MailPoetTest { private $subscribers; function _before() { + parent::_before(); $this->mapper = new MailPoetMapper(); $this->subscribers = ['a@example.com', 'c d ']; } diff --git a/tests/integration/Mailer/Methods/ErrorMappers/PHPMailMapperTest.php b/tests/integration/Mailer/Methods/ErrorMappers/PHPMailMapperTest.php index 12aee28ed5..b2fe6bb162 100644 --- a/tests/integration/Mailer/Methods/ErrorMappers/PHPMailMapperTest.php +++ b/tests/integration/Mailer/Methods/ErrorMappers/PHPMailMapperTest.php @@ -10,6 +10,7 @@ class PHPMailMapperTest extends \MailPoetTest { private $mapper; function _before() { + parent::_before(); $this->mapper = new PHPMailMapper(); } diff --git a/tests/integration/Mailer/Methods/ErrorMappers/SMTPMapperTest.php b/tests/integration/Mailer/Methods/ErrorMappers/SMTPMapperTest.php index ce2455bef5..a9c41b8a74 100644 --- a/tests/integration/Mailer/Methods/ErrorMappers/SMTPMapperTest.php +++ b/tests/integration/Mailer/Methods/ErrorMappers/SMTPMapperTest.php @@ -11,6 +11,7 @@ class SMTPMapperTest extends \MailPoetTest { private $mapper; function _before() { + parent::_before(); $this->mapper = new SMTPMapper(); } diff --git a/tests/integration/Mailer/Methods/ErrorMappers/SendGridMapperTest.php b/tests/integration/Mailer/Methods/ErrorMappers/SendGridMapperTest.php index 6d40121a86..55a9b2acab 100644 --- a/tests/integration/Mailer/Methods/ErrorMappers/SendGridMapperTest.php +++ b/tests/integration/Mailer/Methods/ErrorMappers/SendGridMapperTest.php @@ -13,6 +13,7 @@ class SendGridMapperTest extends \MailPoetTest { private $response = []; function _before() { + parent::_before(); $this->mapper = new SendGridMapper(); $this->response = [ 'errors' => [ diff --git a/tests/integration/Mailer/Methods/MailPoetAPITest.php b/tests/integration/Mailer/Methods/MailPoetAPITest.php index e1db2009fe..7bc167915f 100644 --- a/tests/integration/Mailer/Methods/MailPoetAPITest.php +++ b/tests/integration/Mailer/Methods/MailPoetAPITest.php @@ -10,6 +10,7 @@ use MailPoet\Services\Bridge\API; class MailPoetAPITest extends \MailPoetTest { function _before() { + parent::_before(); $this->settings = array( 'method' => 'MailPoet', 'api_key' => getenv('WP_TEST_MAILER_MAILPOET_API') ? diff --git a/tests/integration/Mailer/Methods/PHPMailTest.php b/tests/integration/Mailer/Methods/PHPMailTest.php index b57a90363b..aa2247fb7a 100644 --- a/tests/integration/Mailer/Methods/PHPMailTest.php +++ b/tests/integration/Mailer/Methods/PHPMailTest.php @@ -6,6 +6,7 @@ use MailPoet\Mailer\Methods\PHPMail; class PHPMailTest extends \MailPoetTest { function _before() { + parent::_before(); $this->sender = array( 'from_name' => 'Sender', 'from_email' => 'staff@mailpoet.com', diff --git a/tests/integration/Mailer/Methods/SMTPTest.php b/tests/integration/Mailer/Methods/SMTPTest.php index 9337184001..814840c23e 100644 --- a/tests/integration/Mailer/Methods/SMTPTest.php +++ b/tests/integration/Mailer/Methods/SMTPTest.php @@ -9,6 +9,7 @@ use MailPoet\WP\Functions as WPFunctions; class SMTPTest extends \MailPoetTest { function _before() { + parent::_before(); $this->settings = array( 'method' => 'SMTP', 'host' => getenv('WP_TEST_MAILER_SMTP_HOST') ? diff --git a/tests/integration/Mailer/Methods/SendGridTest.php b/tests/integration/Mailer/Methods/SendGridTest.php index 6061196994..a0acddc873 100644 --- a/tests/integration/Mailer/Methods/SendGridTest.php +++ b/tests/integration/Mailer/Methods/SendGridTest.php @@ -6,6 +6,7 @@ use MailPoet\Mailer\Methods\SendGrid; class SendGridTest extends \MailPoetTest { function _before() { + parent::_before(); $this->settings = array( 'method' => 'SendGrid', 'api_key' => getenv('WP_TEST_MAILER_SENDGRID_API') ? diff --git a/tests/integration/Models/CustomFieldTest.php b/tests/integration/Models/CustomFieldTest.php index 3df401e655..4e66526789 100644 --- a/tests/integration/Models/CustomFieldTest.php +++ b/tests/integration/Models/CustomFieldTest.php @@ -7,6 +7,7 @@ use MailPoet\Models\SubscriberCustomField; class CustomFieldTest extends \MailPoetTest { function _before() { + parent::_before(); $this->data = array( 'name' => 'City', 'type' => CustomField::TYPE_TEXT, diff --git a/tests/integration/Models/FormTest.php b/tests/integration/Models/FormTest.php index 74abacd42f..1635ad13be 100644 --- a/tests/integration/Models/FormTest.php +++ b/tests/integration/Models/FormTest.php @@ -5,6 +5,7 @@ use MailPoet\Models\Form; class FormTest extends \MailPoetTest { function _before() { + parent::_before(); $this->form = Form::createOrUpdate(array( 'name' => 'My Form' )); diff --git a/tests/integration/Models/NewsletterOptionFieldTest.php b/tests/integration/Models/NewsletterOptionFieldTest.php index 11134fa63e..2a015ccbf3 100644 --- a/tests/integration/Models/NewsletterOptionFieldTest.php +++ b/tests/integration/Models/NewsletterOptionFieldTest.php @@ -7,6 +7,7 @@ use MailPoet\Models\NewsletterOptionField; class NewsletterOptionFieldTest extends \MailPoetTest { function _before() { + parent::_before(); $this->data = array( 'name' => 'event', 'newsletter_type' => 'welcome' diff --git a/tests/integration/Models/NewsletterTemplateTest.php b/tests/integration/Models/NewsletterTemplateTest.php index a9fb7c2b02..08e942923d 100644 --- a/tests/integration/Models/NewsletterTemplateTest.php +++ b/tests/integration/Models/NewsletterTemplateTest.php @@ -5,6 +5,7 @@ use MailPoet\Models\NewsletterTemplate; class NewsletterTemplateTest extends \MailPoetTest { function _before() { + parent::_before(); $this->data = array( 'name' => 'Some template', 'body' => '{}', diff --git a/tests/integration/Models/NewsletterTest.php b/tests/integration/Models/NewsletterTest.php index 727a3aae3f..500eebbc19 100644 --- a/tests/integration/Models/NewsletterTest.php +++ b/tests/integration/Models/NewsletterTest.php @@ -18,6 +18,7 @@ use MailPoet\Tasks\Sending as SendingTask; class NewsletterTest extends \MailPoetTest { function _before() { + parent::_before(); $this->newsletter = Newsletter::createOrUpdate(array( 'subject' => 'My Standard Newsletter', 'preheader' => 'Pre Header', diff --git a/tests/integration/Models/ScheduledTaskSubscriberTest.php b/tests/integration/Models/ScheduledTaskSubscriberTest.php index 6536036903..47ca88bf42 100644 --- a/tests/integration/Models/ScheduledTaskSubscriberTest.php +++ b/tests/integration/Models/ScheduledTaskSubscriberTest.php @@ -8,6 +8,7 @@ use MailPoet\Models\Subscriber; class ScheduledTaskSubscriberTest extends \MailPoetTest { function _before() { + parent::_before(); $task = ScheduledTask::create(); $task->hydrate(array( 'status' => ScheduledTask::STATUS_SCHEDULED diff --git a/tests/integration/Models/ScheduledTaskTest.php b/tests/integration/Models/ScheduledTaskTest.php index 4a3f78ed75..f8000ed7c0 100644 --- a/tests/integration/Models/ScheduledTaskTest.php +++ b/tests/integration/Models/ScheduledTaskTest.php @@ -9,6 +9,7 @@ use MailPoet\Models\ScheduledTaskSubscriber; class ScheduledTaskTest extends \MailPoetTest { function _before() { + parent::_before(); $this->task = ScheduledTask::create(); $this->task->hydrate(array( 'status' => ScheduledTask::STATUS_SCHEDULED diff --git a/tests/integration/Models/SegmentTest.php b/tests/integration/Models/SegmentTest.php index 443600aae5..c14ac29bce 100644 --- a/tests/integration/Models/SegmentTest.php +++ b/tests/integration/Models/SegmentTest.php @@ -9,6 +9,7 @@ use MailPoet\Models\SubscriberSegment; class SegmentTest extends \MailPoetTest { function _before() { + parent::_before(); $this->segment_data = array( 'name' => 'some name', 'description' => 'some description' diff --git a/tests/integration/Models/SendingQueueTest.php b/tests/integration/Models/SendingQueueTest.php index 572c97ff72..76853abeeb 100644 --- a/tests/integration/Models/SendingQueueTest.php +++ b/tests/integration/Models/SendingQueueTest.php @@ -11,6 +11,7 @@ use MailPoet\Util\Helpers; class SendingQueueTest extends \MailPoetTest { function _before() { + parent::_before(); $this->queue = SendingQueue::create(); $this->queue->task_id = 0; $this->queue->newsletter_id = 1; @@ -139,4 +140,4 @@ class SendingQueueTest extends \MailPoetTest { \ORM::raw_execute('TRUNCATE ' . ScheduledTaskSubscriber::$_table); \ORM::raw_execute('TRUNCATE ' . SendingQueue::$_table); } -} \ No newline at end of file +} diff --git a/tests/integration/Models/StatisticsFormsTest.php b/tests/integration/Models/StatisticsFormsTest.php index 86f992de4e..0b175affa0 100644 --- a/tests/integration/Models/StatisticsFormsTest.php +++ b/tests/integration/Models/StatisticsFormsTest.php @@ -5,9 +5,6 @@ use MailPoet\Models\StatisticsForms; class StatisticsFormsTest extends \MailPoetTest { - function _before() { - } - function testItCanRecordStats() { $record = StatisticsForms::record($form_id = 1, $subscriber_id = 2); expect($record->form_id)->equals(1); @@ -55,4 +52,4 @@ class StatisticsFormsTest extends \MailPoetTest { function _after() { StatisticsForms::deleteMany(); } -} \ No newline at end of file +} diff --git a/tests/integration/Models/SubscriberSegmentTest.php b/tests/integration/Models/SubscriberSegmentTest.php index 98253708dd..42ce4373fd 100644 --- a/tests/integration/Models/SubscriberSegmentTest.php +++ b/tests/integration/Models/SubscriberSegmentTest.php @@ -8,6 +8,7 @@ use MailPoet\Models\SubscriberSegment; class SubscriberSegmentTest extends \MailPoetTest { function _before() { + parent::_before(); $this->subscriber = Subscriber::createOrUpdate(array( 'email' => 'john.doe@mailpoet.com', 'first_name' => 'John', diff --git a/tests/integration/Models/SubscriberTest.php b/tests/integration/Models/SubscriberTest.php index ba59c33855..293b8a5684 100644 --- a/tests/integration/Models/SubscriberTest.php +++ b/tests/integration/Models/SubscriberTest.php @@ -21,6 +21,7 @@ class SubscriberTest extends \MailPoetTest { private $test_data; function _before() { + parent::_before(); $this->test_data = array( 'first_name' => 'John', 'last_name' => 'Mailer', diff --git a/tests/integration/Newsletter/Editor/PostContentManagerTest.php b/tests/integration/Newsletter/Editor/PostContentManagerTest.php index 60665c9d22..4e25cc3684 100644 --- a/tests/integration/Newsletter/Editor/PostContentManagerTest.php +++ b/tests/integration/Newsletter/Editor/PostContentManagerTest.php @@ -8,6 +8,7 @@ use MailPoet\WP\Functions as WPFunctions; class PostContentManagerTest extends \MailPoetTest { function _before() { + parent::_before(); $this->post_content = new PostContentManager(); } @@ -171,4 +172,4 @@ class PostContentManagerTest extends \MailPoetTest { function _after() { } -} \ No newline at end of file +} diff --git a/tests/integration/Newsletter/Editor/PostContentTransformerTest.php b/tests/integration/Newsletter/Editor/PostContentTransformerTest.php index 4f3cb52571..2f3e0a89d5 100644 --- a/tests/integration/Newsletter/Editor/PostContentTransformerTest.php +++ b/tests/integration/Newsletter/Editor/PostContentTransformerTest.php @@ -15,6 +15,7 @@ class PostContentTransformerTest extends \MailPoetTest { private $image_mock; function _before() { + parent::_before(); $this->content_mock = array( array( 'type' => 'button', @@ -244,4 +245,4 @@ class PostContentTransformerTest extends \MailPoetTest { function _after() { Mock::clean(); } -} \ No newline at end of file +} diff --git a/tests/integration/Newsletter/Editor/StructureTransformerTest.php b/tests/integration/Newsletter/Editor/StructureTransformerTest.php index ca6d736f54..189798c8fb 100644 --- a/tests/integration/Newsletter/Editor/StructureTransformerTest.php +++ b/tests/integration/Newsletter/Editor/StructureTransformerTest.php @@ -7,6 +7,7 @@ use MailPoet\Newsletter\Editor\StructureTransformer; class StructureTransformerTest extends \MailPoetTest { function _before() { + parent::_before(); $this->transformer = new StructureTransformer(); } diff --git a/tests/integration/Newsletter/ShortcodesTest.php b/tests/integration/Newsletter/ShortcodesTest.php index d04132fd16..5d5e1cc76f 100644 --- a/tests/integration/Newsletter/ShortcodesTest.php +++ b/tests/integration/Newsletter/ShortcodesTest.php @@ -10,6 +10,7 @@ use MailPoet\Models\Subscriber; use MailPoet\Models\SubscriberCustomField; use MailPoet\Newsletter\Shortcodes\Categories\Date; use MailPoet\Newsletter\Url as NewsletterUrl; +use MailPoet\Settings\SettingsController; use MailPoet\Subscription\Url as SubscriptionUrl; require_once(ABSPATH . 'wp-admin/includes/user.php'); @@ -18,10 +19,14 @@ class ShortcodesTest extends \MailPoetTest { public $rendered_newsletter; public $newsletter; public $subscriber; + /** @var SettingsController */ + private $settings; function _before() { + parent::_before(); $populator = new Populator(); $populator->up(); + $this->settings = new SettingsController(); $this->WP_user = $this->_createWPUser(); $this->WP_post = $this->_createWPPost(); $this->subscriber = $this->_createSubscriber(); @@ -30,7 +35,7 @@ class ShortcodesTest extends \MailPoetTest { $this->newsletter, $this->subscriber ); - Setting::setValue('tracking.enabled', false); + $this->settings->set('tracking.enabled', false); } function testItCanExtractShortcodes() { diff --git a/tests/integration/Newsletter/ViewInBrowserTest.php b/tests/integration/Newsletter/ViewInBrowserTest.php index d4159bfeff..46111f04a2 100644 --- a/tests/integration/Newsletter/ViewInBrowserTest.php +++ b/tests/integration/Newsletter/ViewInBrowserTest.php @@ -14,6 +14,7 @@ use MailPoet\Tasks\Sending as SendingTask; class ViewInBrowserTest extends \MailPoetTest { function _before() { + parent::_before(); $this->newsletter = array( 'body' => json_decode( diff --git a/tests/integration/Router/Endpoints/TrackTest.php b/tests/integration/Router/Endpoints/TrackTest.php index 698dda3e65..54be862536 100644 --- a/tests/integration/Router/Endpoints/TrackTest.php +++ b/tests/integration/Router/Endpoints/TrackTest.php @@ -13,6 +13,7 @@ use MailPoet\Tasks\Sending as SendingTask; class TrackTest extends \MailPoetTest { function _before() { + parent::_before(); // create newsletter $newsletter = Newsletter::create(); $newsletter->type = 'type'; diff --git a/tests/integration/Router/Endpoints/ViewInBrowserTest.php b/tests/integration/Router/Endpoints/ViewInBrowserTest.php index 44977169ee..ee6980137b 100644 --- a/tests/integration/Router/Endpoints/ViewInBrowserTest.php +++ b/tests/integration/Router/Endpoints/ViewInBrowserTest.php @@ -14,6 +14,7 @@ use MailPoet\Tasks\Sending as SendingTask; class ViewInBrowserTest extends \MailPoetTest { function _before() { + parent::_before(); // create newsletter $newsletter = Newsletter::create(); $newsletter->type = 'type'; diff --git a/tests/integration/Router/RouterTest.php b/tests/integration/Router/RouterTest.php index 6a71a39200..6da0a40aa6 100644 --- a/tests/integration/Router/RouterTest.php +++ b/tests/integration/Router/RouterTest.php @@ -20,6 +20,7 @@ class RouterTest extends \MailPoetTest { private $container; function _before() { + parent::_before(); $this->router_data = array( Router::NAME => '', 'endpoint' => 'router_test_mock_endpoint', diff --git a/tests/integration/Segments/BulkActionTest.php b/tests/integration/Segments/BulkActionTest.php index ae53673f81..ba0339bec9 100644 --- a/tests/integration/Segments/BulkActionTest.php +++ b/tests/integration/Segments/BulkActionTest.php @@ -13,6 +13,7 @@ require_once('SubscribersBulkActionHandlerMock.php'); class BulkActionTest extends \MailPoetTest { function _before() { + parent::_before(); $this->cleanData(); $this->segment_1 = Segment::createOrUpdate(array('name' => 'Segment 1', 'type' => 'default')); $this->segment_2 = Segment::createOrUpdate(array('name' => 'Segment 3', 'type' => 'not default')); diff --git a/tests/integration/Segments/SubscribersFinderTest.php b/tests/integration/Segments/SubscribersFinderTest.php index 5a23542a50..f3ddc7c837 100644 --- a/tests/integration/Segments/SubscribersFinderTest.php +++ b/tests/integration/Segments/SubscribersFinderTest.php @@ -16,6 +16,7 @@ use MailPoet\WP\Functions as WPFunctions; class SubscribersFinderTest extends \MailPoetTest { function _before() { + parent::_before(); \ORM::raw_execute('TRUNCATE ' . ScheduledTask::$_table); \ORM::raw_execute('TRUNCATE ' . ScheduledTaskSubscriber::$_table); \ORM::raw_execute('TRUNCATE ' . Segment::$_table); diff --git a/tests/integration/Segments/SubscribersListingsTest.php b/tests/integration/Segments/SubscribersListingsTest.php index 5b89f407c4..a8d26da7dd 100644 --- a/tests/integration/Segments/SubscribersListingsTest.php +++ b/tests/integration/Segments/SubscribersListingsTest.php @@ -17,6 +17,7 @@ class SubscribersListingsTest extends \MailPoetTest { private $finder; function _before() { + parent::_before(); $this->finder = ContainerWrapper::getInstance()->get(SubscribersListings::class); $this->cleanData(); $this->segment_1 = Segment::createOrUpdate(array('name' => 'Segment 1', 'type' => 'default')); diff --git a/tests/integration/Segments/WPTest.php b/tests/integration/Segments/WPTest.php index eb26f2701c..61c9f29b29 100644 --- a/tests/integration/Segments/WPTest.php +++ b/tests/integration/Segments/WPTest.php @@ -245,6 +245,7 @@ class WPTest extends \MailPoetTest { } function _before() { + parent::_before(); $this->cleanData(); } @@ -355,4 +356,4 @@ class WPTest extends \MailPoetTest { ); } -} \ No newline at end of file +} diff --git a/tests/integration/Services/BridgeTest.php b/tests/integration/Services/BridgeTest.php index 5f3e1168be..212572b9f0 100644 --- a/tests/integration/Services/BridgeTest.php +++ b/tests/integration/Services/BridgeTest.php @@ -14,6 +14,7 @@ require_once('BridgeTestMockAPI.php'); class BridgeTest extends \MailPoetTest { function _before() { + parent::_before(); $this->valid_key = 'abcdefghijklmnopqrstuvwxyz'; $this->invalid_key = '401' . $this->valid_key; $this->expiring_key = 'expiring' . $this->valid_key; diff --git a/tests/integration/Settings/SettingsControllerTest.php b/tests/integration/Settings/SettingsControllerTest.php index 347a004132..82a15d95b2 100644 --- a/tests/integration/Settings/SettingsControllerTest.php +++ b/tests/integration/Settings/SettingsControllerTest.php @@ -11,6 +11,7 @@ class SettingsControllerTest extends \MailPoetTest { private $controller; function _before() { + parent::_before(); $this->controller = new SettingsController(); } diff --git a/tests/integration/Statistics/Track/ClicksTest.php b/tests/integration/Statistics/Track/ClicksTest.php index b99fd52bc8..c1e0fe0890 100644 --- a/tests/integration/Statistics/Track/ClicksTest.php +++ b/tests/integration/Statistics/Track/ClicksTest.php @@ -19,6 +19,7 @@ class ClicksTest extends \MailPoetTest { private $clicks; function _before() { + parent::_before(); // create newsletter $newsletter = Newsletter::create(); $newsletter->type = 'type'; diff --git a/tests/integration/Statistics/Track/OpensTest.php b/tests/integration/Statistics/Track/OpensTest.php index 1415199d42..c698534ccd 100644 --- a/tests/integration/Statistics/Track/OpensTest.php +++ b/tests/integration/Statistics/Track/OpensTest.php @@ -13,6 +13,7 @@ use MailPoet\Tasks\Sending as SendingTask; class OpensTest extends \MailPoetTest { function _before() { + parent::_before(); // create newsletter $newsletter = Newsletter::create(); $newsletter->type = 'type'; @@ -96,4 +97,4 @@ class OpensTest extends \MailPoetTest { \ORM::raw_execute('TRUNCATE ' . SendingQueue::$_table); \ORM::raw_execute('TRUNCATE ' . StatisticsOpens::$_table); } -} \ No newline at end of file +} diff --git a/tests/integration/Statistics/Track/UnsubscribesTest.php b/tests/integration/Statistics/Track/UnsubscribesTest.php index 34b58590ec..4090b4dbe5 100644 --- a/tests/integration/Statistics/Track/UnsubscribesTest.php +++ b/tests/integration/Statistics/Track/UnsubscribesTest.php @@ -11,6 +11,7 @@ use MailPoet\Tasks\Sending as SendingTask; class UnsubscribesTest extends \MailPoetTest { function _before() { + parent::_before(); // create newsletter $newsletter = Newsletter::create(); $newsletter->type = 'type'; @@ -57,4 +58,4 @@ class UnsubscribesTest extends \MailPoetTest { \ORM::raw_execute('TRUNCATE ' . SendingQueue::$_table); \ORM::raw_execute('TRUNCATE ' . StatisticsUnsubscribes::$_table); } -} \ No newline at end of file +} diff --git a/tests/integration/Subscribers/ImportExport/Export/DefaultSubscribersGetterTest.php b/tests/integration/Subscribers/ImportExport/Export/DefaultSubscribersGetterTest.php index f34b85f4f3..dd8380667c 100644 --- a/tests/integration/Subscribers/ImportExport/Export/DefaultSubscribersGetterTest.php +++ b/tests/integration/Subscribers/ImportExport/Export/DefaultSubscribersGetterTest.php @@ -11,6 +11,7 @@ use MailPoet\Subscribers\ImportExport\Export\DefaultSubscribersGetter; class DefaultSubscribersGetterTest extends \MailPoetTest { function _before() { + parent::_before(); $this->subscriber_fields = array( 'first_name' => 'First name', 'last_name' => 'Last name', diff --git a/tests/integration/Subscribers/ImportExport/Export/DynamicSubscribersGetterTest.php b/tests/integration/Subscribers/ImportExport/Export/DynamicSubscribersGetterTest.php index c48997cc26..77f570add1 100644 --- a/tests/integration/Subscribers/ImportExport/Export/DynamicSubscribersGetterTest.php +++ b/tests/integration/Subscribers/ImportExport/Export/DynamicSubscribersGetterTest.php @@ -11,6 +11,7 @@ use MailPoet\Subscribers\ImportExport\Export\DynamicSubscribersGetter; class DynamicSubscribersGetterTest extends \MailPoetTest { function _before() { + parent::_before(); $this->subscriber_fields = array( 'first_name' => 'First name', 'last_name' => 'Last name', diff --git a/tests/integration/Subscribers/ImportExport/Export/ExportTest.php b/tests/integration/Subscribers/ImportExport/Export/ExportTest.php index 36a25c54b0..1dae83fe36 100644 --- a/tests/integration/Subscribers/ImportExport/Export/ExportTest.php +++ b/tests/integration/Subscribers/ImportExport/Export/ExportTest.php @@ -13,6 +13,7 @@ use MailPoet\Subscribers\ImportExport\Export\DefaultSubscribersGetter; class ExportTest extends \MailPoetTest { function _before() { + parent::_before(); $this->JSON_data = json_decode(file_get_contents(dirname(__FILE__) . '/ExportTestData.json'), true); $this->subscriber_fields = array( 'first_name' => 'First name', diff --git a/tests/integration/Subscribers/ImportExport/ImportExportFactoryTest.php b/tests/integration/Subscribers/ImportExport/ImportExportFactoryTest.php index 20bcd28107..d60ade9fd4 100644 --- a/tests/integration/Subscribers/ImportExport/ImportExportFactoryTest.php +++ b/tests/integration/Subscribers/ImportExport/ImportExportFactoryTest.php @@ -9,6 +9,7 @@ use MailPoet\Subscribers\ImportExport\ImportExportFactory; class ImportExportFactoryTest extends \MailPoetTest { function _before() { + parent::_before(); $segment_1 = Segment::createOrUpdate(array('name' => 'Unconfirmed Segment')); $segment_2 = Segment::createOrUpdate(array('name' => 'Confirmed Segment')); diff --git a/tests/integration/Subscribers/ImportExport/PersonalDataExporters/NewsletterClicksExporterTest.php b/tests/integration/Subscribers/ImportExport/PersonalDataExporters/NewsletterClicksExporterTest.php index d075e891b7..0b09883efb 100644 --- a/tests/integration/Subscribers/ImportExport/PersonalDataExporters/NewsletterClicksExporterTest.php +++ b/tests/integration/Subscribers/ImportExport/PersonalDataExporters/NewsletterClicksExporterTest.php @@ -15,6 +15,7 @@ class NewsletterClicksExporterTest extends \MailPoetTest { private $exporter; function _before() { + parent::_before(); $this->exporter = new NewsletterClicksExporter(); } diff --git a/tests/integration/Subscribers/ImportExport/PersonalDataExporters/NewslettersExporterTest.php b/tests/integration/Subscribers/ImportExport/PersonalDataExporters/NewslettersExporterTest.php index 26bd733498..8005cedab9 100644 --- a/tests/integration/Subscribers/ImportExport/PersonalDataExporters/NewslettersExporterTest.php +++ b/tests/integration/Subscribers/ImportExport/PersonalDataExporters/NewslettersExporterTest.php @@ -14,6 +14,7 @@ class NewslettersExporterTest extends \MailPoetTest { private $exporter; function _before() { + parent::_before(); $this->exporter = new NewslettersExporter(); } diff --git a/tests/integration/Subscribers/ImportExport/PersonalDataExporters/SegmentsExporterTest.php b/tests/integration/Subscribers/ImportExport/PersonalDataExporters/SegmentsExporterTest.php index ee259de5c1..eacae55a09 100644 --- a/tests/integration/Subscribers/ImportExport/PersonalDataExporters/SegmentsExporterTest.php +++ b/tests/integration/Subscribers/ImportExport/PersonalDataExporters/SegmentsExporterTest.php @@ -12,6 +12,7 @@ class SegmentsExporterTest extends \MailPoetTest { private $exporter; function _before() { + parent::_before(); $this->exporter = new SegmentsExporter(); } diff --git a/tests/integration/Subscribers/ImportExport/PersonalDataExporters/SubscriberExporterTest.php b/tests/integration/Subscribers/ImportExport/PersonalDataExporters/SubscriberExporterTest.php index dec36afde9..5c0fb13ef8 100644 --- a/tests/integration/Subscribers/ImportExport/PersonalDataExporters/SubscriberExporterTest.php +++ b/tests/integration/Subscribers/ImportExport/PersonalDataExporters/SubscriberExporterTest.php @@ -11,6 +11,7 @@ class SubscriberExporterTest extends \MailPoetTest { private $exporter; function _before() { + parent::_before(); $this->exporter = new SubscriberExporter(); } diff --git a/tests/integration/Subscribers/RequiredCustomFieldValidatorTest.php b/tests/integration/Subscribers/RequiredCustomFieldValidatorTest.php index ad3ca79373..b24aaddb97 100644 --- a/tests/integration/Subscribers/RequiredCustomFieldValidatorTest.php +++ b/tests/integration/Subscribers/RequiredCustomFieldValidatorTest.php @@ -9,6 +9,7 @@ class RequiredCustomFieldValidatorTest extends \MailPoetTest { private $custom_field; function _before() { + parent::_before(); \ORM::raw_execute('TRUNCATE ' . CustomField::$_table); $this->custom_field = CustomField::createOrUpdate([ 'name' => 'custom field', @@ -45,4 +46,4 @@ class RequiredCustomFieldValidatorTest extends \MailPoetTest { $validator->validate(['cf_' . $this->custom_field->id() => '']); } -} \ No newline at end of file +} diff --git a/tests/integration/Subscribers/SubscriberPersonalDataEraserTest.php b/tests/integration/Subscribers/SubscriberPersonalDataEraserTest.php index 7da970a513..0058dcb556 100644 --- a/tests/integration/Subscribers/SubscriberPersonalDataEraserTest.php +++ b/tests/integration/Subscribers/SubscriberPersonalDataEraserTest.php @@ -12,6 +12,7 @@ class SubscriberPersonalDataEraserTest extends \MailPoetTest { private $eraser; function _before() { + parent::_before(); $this->eraser = new SubscriberPersonalDataEraser(); \ORM::raw_execute('TRUNCATE ' . Subscriber::$_table); \ORM::raw_execute('TRUNCATE ' . CustomField::$_table); diff --git a/tests/integration/Subscription/FormTest.php b/tests/integration/Subscription/FormTest.php index a9391f5069..e98b4d47d3 100644 --- a/tests/integration/Subscription/FormTest.php +++ b/tests/integration/Subscription/FormTest.php @@ -18,6 +18,7 @@ class FormTest extends \MailPoetTest { private $form_controller; function _before() { + parent::_before(); Setting::setValue('sender', array( 'name' => 'John Doe', 'address' => 'john.doe@example.com' diff --git a/tests/integration/Subscription/PagesTest.php b/tests/integration/Subscription/PagesTest.php index 646f3af046..1b5f744631 100644 --- a/tests/integration/Subscription/PagesTest.php +++ b/tests/integration/Subscription/PagesTest.php @@ -19,6 +19,7 @@ class PagesTest extends \MailPoetTest { private $test_data = []; function _before() { + parent::_before(); $this->subscriber = Subscriber::create(); $this->subscriber->hydrate(Fixtures::get('subscriber_template')); $this->subscriber->status = Subscriber::STATUS_UNCONFIRMED; diff --git a/tests/integration/Subscription/UrlTest.php b/tests/integration/Subscription/UrlTest.php index db581844c5..5f6ba9ee48 100644 --- a/tests/integration/Subscription/UrlTest.php +++ b/tests/integration/Subscription/UrlTest.php @@ -9,6 +9,7 @@ use MailPoet\Config\Populator; class UrlTest extends \MailPoetTest { function _before() { + parent::_before(); $populator = new Populator(); $populator->up(); } diff --git a/tests/integration/Tasks/SendingTest.php b/tests/integration/Tasks/SendingTest.php index 16eaed09ff..557e70744e 100644 --- a/tests/integration/Tasks/SendingTest.php +++ b/tests/integration/Tasks/SendingTest.php @@ -11,6 +11,7 @@ use MailPoet\Tasks\Subscribers; class SendingTest extends \MailPoetTest { function _before() { + parent::_before(); $this->newsletter = $this->createNewNewsletter(); $this->task = $this->createNewScheduledTask(); $this->queue = $this->createNewSendingQueue([ diff --git a/tests/integration/Tasks/StateTest.php b/tests/integration/Tasks/StateTest.php index 79db4f0740..7d369269b4 100644 --- a/tests/integration/Tasks/StateTest.php +++ b/tests/integration/Tasks/StateTest.php @@ -14,6 +14,7 @@ class StateTest extends \MailPoetTest { private $tasks_state; function _before() { + parent::_before(); $this->tasks_state = new State(); } diff --git a/tests/integration/Tasks/Subscribers/BatchIteratorTest.php b/tests/integration/Tasks/Subscribers/BatchIteratorTest.php index d1e7b6a79a..6ac97b684d 100644 --- a/tests/integration/Tasks/Subscribers/BatchIteratorTest.php +++ b/tests/integration/Tasks/Subscribers/BatchIteratorTest.php @@ -6,6 +6,7 @@ use MailPoet\Tasks\Subscribers\BatchIterator; class BatchIteratorTest extends \MailPoetTest { function _before() { + parent::_before(); $this->task_id = 123; // random ID $this->batch_size = 2; $this->subscriber_count = 10; diff --git a/tests/integration/Twig/AssetsTest.php b/tests/integration/Twig/AssetsTest.php index 58da73b792..3b8b249e4c 100644 --- a/tests/integration/Twig/AssetsTest.php +++ b/tests/integration/Twig/AssetsTest.php @@ -5,6 +5,7 @@ use MailPoet\Twig\Assets; class AssetsTest extends \MailPoetTest { function _before() { + parent::_before(); $this->assets_url = 'https://www.testing.com/wp-content/plugins/mailpoet/assets'; $this->version = '1.2.3'; $this->assets_extension = new Assets( @@ -99,4 +100,4 @@ class AssetsTest extends \MailPoetTest { $with_query_string . '&mailpoet_version=' . $this->version ); } -} \ No newline at end of file +} diff --git a/tests/integration/Util/Notices/PHPVersionWarningsTest.php b/tests/integration/Util/Notices/PHPVersionWarningsTest.php index 04b698e6ef..aec421ec0b 100644 --- a/tests/integration/Util/Notices/PHPVersionWarningsTest.php +++ b/tests/integration/Util/Notices/PHPVersionWarningsTest.php @@ -10,6 +10,7 @@ class PHPVersionWarningsTest extends \MailPoetTest { private $phpVersionWarning; function _before() { + parent::_before(); $this->phpVersionWarning = new PHPVersionWarnings(); delete_transient('dismissed-php-version-outdated-notice'); } diff --git a/tests/integration/WP/EmojiTest.php b/tests/integration/WP/EmojiTest.php index d062d5e297..b3a9322be6 100644 --- a/tests/integration/WP/EmojiTest.php +++ b/tests/integration/WP/EmojiTest.php @@ -6,6 +6,7 @@ use MailPoet\WP\Emoji; class EmojiTest extends \MailPoetTest { function _before() { + parent::_before(); $this->data_encoded = "Emojis: 😃😵💪, not emojis: .Ž"; $this->data_decoded = "Emojis: 😃😵💪, not emojis: .Ž"; diff --git a/tests/integration/WP/FunctionsTest.php b/tests/integration/WP/FunctionsTest.php index 4cf7f1cf4c..6053a75288 100644 --- a/tests/integration/WP/FunctionsTest.php +++ b/tests/integration/WP/FunctionsTest.php @@ -6,6 +6,7 @@ use MailPoet\Config\Env; class FunctionsTest extends \MailPoetTest { function _before() { + parent::_before(); global $content_width; $this->_content_width = $content_width; $content_width = 150; diff --git a/tests/integration/_bootstrap.php b/tests/integration/_bootstrap.php index eec98304e9..8db03a3632 100644 --- a/tests/integration/_bootstrap.php +++ b/tests/integration/_bootstrap.php @@ -127,6 +127,10 @@ abstract class MailPoetTest extends \Codeception\TestCase\Test { protected $preserveGlobalState = false; protected $inIsolation = false; + function _before() { + \MailPoet\Settings\SettingsController::resetCache(); + } + /** * Call protected/private method of a class. *