Add SettingsController cache reset to integration tests

[MAILPOET-1757]

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');

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);
     }

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'));

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',

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(

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'));

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',

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');
   }

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);
   }
 

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);
   }
 

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();

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);
   }

tests/integration/Config/DatabaseTest.php

@@ -14,6 +14,7 @@ class DatabaseTest extends \MailPoetTest {
   }
 
   function _before() {
+    parent::_before();
     \ORM::set_db(null);
   }
 

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;

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(

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();
   }
 

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();
   }
 

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);
   }
 

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();

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;

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';

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(

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();
   }
 

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

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

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

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',

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);
   }
-}
+}

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));
   }

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));
   }

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();

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();
   }
 

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();

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();

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);
   }
-}
+}

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);
   }
-}
+}

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();
   }
 

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);
   }
-}
+}

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',

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',

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') ?

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' => [

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 <b@example.com>'];
   }

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();
   }
 

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();
   }
 

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' => [

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') ?

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',

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') ?

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') ?

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,

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'
     ));

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'

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' => '{}',

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',

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

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

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'

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);
   }
-}
+}

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();
   }
-}
+}

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',

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',

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() {
   }
-}
+}

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();
   }
-}
+}

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();
   }
 

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() {

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(

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';

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';

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',

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'));

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);

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'));

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  {
     );
   }
 
-}
+}

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;

tests/integration/Settings/SettingsControllerTest.php

@@ -11,6 +11,7 @@ class SettingsControllerTest extends \MailPoetTest {
   private $controller;
 
   function _before() {
+    parent::_before();
     $this->controller = new SettingsController();
   }
 

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';

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);
   }
-}
+}

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);
   }
-}
+}

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',

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',

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',

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'));
 

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();
   }
 

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();
   }
 

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();
   }
 

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();
   }
 

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() => '']);
   }
 
-}
+}

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);

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'

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;

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();
   }

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([

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();
   }
 

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;

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
     );
   }
-}
+}

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');
   }

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: .Ž";
 

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;

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.
    *