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

Fix Populator constructions in integration tests

Browse Source 
[MAILPOET-2203]
This commit is contained in:
Rostislav Wolny
2019-07-24 15:13:51 +02:00
committed by Rostislav Wolný
parent 47861cdf19
commit 620b2d8a75
5 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,6 +6,7 @@ use MailPoet\Config\Activator;
use MailPoet\Config\Populator; use MailPoet\Config\Populator;
use MailPoet\Models\Setting; use MailPoet\Models\Setting;
use MailPoet\API\JSON\v1\Setup; use MailPoet\API\JSON\v1\Setup;
use MailPoet\Referrals\ReferralDetector;
use MailPoet\WP\Functions as WPFunctions; use MailPoet\WP\Functions as WPFunctions;
use Helper\WordPressHooks as WPHooksHelper; use Helper\WordPressHooks as WPHooksHelper;
use MailPoet\API\JSON\Response as APIResponse; use MailPoet\API\JSON\Response as APIResponse;
@ -25,7 +26,8 @@ class SetupTest extends \MailPoetTest {
]); ]);
$settings = new SettingsController(); $settings = new SettingsController();
$populator = new Populator($settings, $wp, new Captcha()); $referral_detector = new ReferralDetector($wp, $settings);
$populator = new Populator($settings, $wp, new Captcha(), $referral_detector);
$router = new Setup($wp, new Activator($settings, $populator)); $router = new Setup($wp, new Activator($settings, $populator));
$response = $router->reset(); $response = $router->reset();
expect($response->status)->equals(APIResponse::STATUS_OK); expect($response->status)->equals(APIResponse::STATUS_OK);

4
tests/integration/Cron/Workers/SendingQueue/SendingQueueTest.php
View File

@ -27,6 +27,7 @@ use MailPoet\Models\StatisticsNewsletters;
use MailPoet\Models\Subscriber; use MailPoet\Models\Subscriber;
use MailPoet\Models\SubscriberSegment; use MailPoet\Models\SubscriberSegment;
use MailPoet\Newsletter\Links\Links; use MailPoet\Newsletter\Links\Links;
use MailPoet\Referrals\ReferralDetector;
use MailPoet\Router\Endpoints\Track; use MailPoet\Router\Endpoints\Track;
use MailPoet\Router\Router; use MailPoet\Router\Router;
use MailPoet\Settings\SettingsController; use MailPoet\Settings\SettingsController;
@ -48,7 +49,8 @@ class SendingQueueTest extends \MailPoetTest {
$wp_users = get_users(); $wp_users = get_users();
wp_set_current_user($wp_users[0]->ID); wp_set_current_user($wp_users[0]->ID);
$this->settings = new SettingsController(); $this->settings = new SettingsController();
$populator = new Populator($this->settings, WPFunctions::get(), new Captcha); $referral_detector = new ReferralDetector(WPFunctions::get(), $this->settings);
$populator = new Populator($this->settings, WPFunctions::get(), new Captcha, $referral_detector);
$populator->up(); $populator->up();
$this->subscriber = Subscriber::create(); $this->subscriber = Subscriber::create();
$this->subscriber->email = 'john@doe.com'; $this->subscriber->email = 'john@doe.com';

4
tests/integration/Cron/Workers/SendingQueue/Tasks/MailerTest.php
View File

@ -8,6 +8,7 @@ use MailPoet\Cron\Workers\SendingQueue\Tasks\Mailer as MailerTask;
use MailPoet\Mailer\Mailer; use MailPoet\Mailer\Mailer;
use MailPoet\Models\Setting; use MailPoet\Models\Setting;
use MailPoet\Models\Subscriber; use MailPoet\Models\Subscriber;
use MailPoet\Referrals\ReferralDetector;
use MailPoet\Settings\SettingsController; use MailPoet\Settings\SettingsController;
use MailPoet\Subscription\Captcha; use MailPoet\Subscription\Captcha;
use MailPoet\WP\Functions as WPFunctions; use MailPoet\WP\Functions as WPFunctions;
@ -26,7 +27,8 @@ class MailerTest extends \MailPoetTest {
$wp_users = get_users(); $wp_users = get_users();
wp_set_current_user($wp_users[0]->ID); wp_set_current_user($wp_users[0]->ID);
$this->settings = new SettingsController(); $this->settings = new SettingsController();
$populator = new Populator($this->settings, WPFunctions::get(), new Captcha); $referral_detector = new ReferralDetector(WPFunctions::get(), $this->settings);
$populator = new Populator($this->settings, WPFunctions::get(), new Captcha, $referral_detector);
$populator->up(); $populator->up();
$this->mailer_task = new MailerTask(); $this->mailer_task = new MailerTask();
$this->sender = $this->settings->get('sender'); $this->sender = $this->settings->get('sender');

4
tests/integration/Newsletter/ShortcodesTest.php
View File

@ -9,6 +9,7 @@ use MailPoet\Models\Subscriber;
use MailPoet\Models\SubscriberCustomField; use MailPoet\Models\SubscriberCustomField;
use MailPoet\Newsletter\Shortcodes\Categories\Date; use MailPoet\Newsletter\Shortcodes\Categories\Date;
use MailPoet\Newsletter\Url as NewsletterUrl; use MailPoet\Newsletter\Url as NewsletterUrl;
use MailPoet\Referrals\ReferralDetector;
use MailPoet\Settings\SettingsController; use MailPoet\Settings\SettingsController;
use MailPoet\Subscription\Captcha; use MailPoet\Subscription\Captcha;
use MailPoet\Subscription\Url as SubscriptionUrl; use MailPoet\Subscription\Url as SubscriptionUrl;
@ -26,7 +27,8 @@ class ShortcodesTest extends \MailPoetTest {
function _before() { function _before() {
parent::_before(); parent::_before();
$this->settings = new SettingsController(); $this->settings = new SettingsController();
$populator = new Populator($this->settings, WPFunctions::get(), new Captcha); $referral_detector = new ReferralDetector(WPFunctions::get(), $this->settings);
$populator = new Populator($this->settings, WPFunctions::get(), new Captcha, $referral_detector);
$populator->up(); $populator->up();
$this->WP_user = $this->_createWPUser(); $this->WP_user = $this->_createWPUser();
$this->WP_post = $this->_createWPPost(); $this->WP_post = $this->_createWPPost();

4
tests/integration/Subscription/UrlTest.php
View File

@ -1,6 +1,7 @@
<?php <?php
namespace MailPoet\Test\Subscription; namespace MailPoet\Test\Subscription;
use MailPoet\Referrals\ReferralDetector;
use MailPoet\Router\Router; use MailPoet\Router\Router;
use MailPoet\Subscription\Url; use MailPoet\Subscription\Url;
use MailPoet\Models\Subscriber; use MailPoet\Models\Subscriber;
@ -14,7 +15,8 @@ class UrlTest extends \MailPoetTest {
function _before() { function _before() {
parent::_before(); parent::_before();
$this->settings = new SettingsController; $this->settings = new SettingsController;
$populator = new Populator($this->settings, WPFunctions::get(), new Captcha); $referral_detector = new ReferralDetector(WPFunctions::get(), $this->settings);
$populator = new Populator($this->settings, WPFunctions::get(), new Captcha, $referral_detector);
$populator->up(); $populator->up();
} }