Fix Squiz.Classes.ClassFileName sniffer rule in tests [MAIPOET-1025]

This commit is contained in:
stoletniy
2017-07-26 17:03:43 +03:00
parent 6520d5eca3
commit 321393f119
36 changed files with 134 additions and 107 deletions

View File

@ -91,7 +91,7 @@
<!-- When referencing arrays there should be no whitespace between brackets --> <!-- When referencing arrays there should be no whitespace between brackets -->
<rule ref="Squiz.Arrays.ArrayBracketSpacing"/> <rule ref="Squiz.Arrays.ArrayBracketSpacing"/>
<!-- Class name and file name must match --> <!-- Class name and file name must match -->
<!-- <rule ref="Squiz.Classes.ClassFileName"/> --> <rule ref="Squiz.Classes.ClassFileName"/>
<!-- Classes should be named camel case with first letter capitalised --> <!-- Classes should be named camel case with first letter capitalised -->
<rule ref="Squiz.Classes.ValidClassName"/> <rule ref="Squiz.Classes.ValidClassName"/>
<!-- Checks for empty catch statements. It must at least have a comment --> <!-- Checks for empty catch statements. It must at least have a comment -->

View File

@ -1,4 +1,5 @@
<?php <?php
namespace MailPoet\Test\API\JSON;
use Codeception\Util\Stub; use Codeception\Util\Stub;
use MailPoet\API\JSON\API; use MailPoet\API\JSON\API;
@ -10,7 +11,7 @@ require_once(ABSPATH.'wp-admin/includes/user.php');
require_once('APITestNamespacedEndpointStubV1.php'); require_once('APITestNamespacedEndpointStubV1.php');
require_once('APITestNamespacedEndpointStubV2.php'); require_once('APITestNamespacedEndpointStubV2.php');
class JSONAPITest extends MailPoetTest { class APITest extends \MailPoetTest {
function _before() { function _before() {
// create WP user // create WP user
$this->wp_user_id = null; $this->wp_user_id = null;
@ -74,7 +75,7 @@ class JSONAPITest extends MailPoetTest {
function testItReturns400ErrorWhenAPIVersionIsNotSpecified() { function testItReturns400ErrorWhenAPIVersionIsNotSpecified() {
$data = array( $data = array(
'endpoint' => 'namespaced_endpoint_stub', 'endpoint' => 'a_p_i_test_namespaced_endpoint_stub_v1',
'method' => 'test' 'method' => 'test'
); );
@ -90,7 +91,7 @@ class JSONAPITest extends MailPoetTest {
$this->api->addEndpointNamespace($namespace['name'], $namespace['version']); $this->api->addEndpointNamespace($namespace['name'], $namespace['version']);
$data = array( $data = array(
'endpoint' => 'namespaced_endpoint_stub', 'endpoint' => 'a_p_i_test_namespaced_endpoint_stub_v2',
'api_version' => 'v2', 'api_version' => 'v2',
'method' => 'test' 'method' => 'test'
); );
@ -98,7 +99,7 @@ class JSONAPITest extends MailPoetTest {
expect($this->api->getRequestedAPIVersion())->equals('v2'); expect($this->api->getRequestedAPIVersion())->equals('v2');
expect($this->api->getRequestedEndpointClass())->equals( expect($this->api->getRequestedEndpointClass())->equals(
'MailPoet\API\JSON\v2\NamespacedEndpointStub' 'MailPoet\API\JSON\v2\APITestNamespacedEndpointStubV2'
); );
} }
@ -110,7 +111,7 @@ class JSONAPITest extends MailPoetTest {
$this->api->addEndpointNamespace($namespace['name'], $namespace['version']); $this->api->addEndpointNamespace($namespace['name'], $namespace['version']);
$data = array( $data = array(
'endpoint' => 'namespaced_endpoint_stub', 'endpoint' => 'a_p_i_test_namespaced_endpoint_stub_v1',
'method' => 'test', 'method' => 'test',
'api_version' => 'v1', 'api_version' => 'v1',
'data' => array('test' => 'data') 'data' => array('test' => 'data')
@ -129,7 +130,7 @@ class JSONAPITest extends MailPoetTest {
$this->api->addEndpointNamespace($namespace['name'], $namespace['version']); $this->api->addEndpointNamespace($namespace['name'], $namespace['version']);
$data = array( $data = array(
'endpoint' => 'namespaced_endpoint_stub', 'endpoint' => 'a_p_i_test_namespaced_endpoint_stub_v2',
'api_version' => 'v2', 'api_version' => 'v2',
'method' => 'testVersion' 'method' => 'testVersion'
); );

View File

@ -7,7 +7,7 @@ use MailPoet\API\JSON\Access as APIAccess;
if(!defined('ABSPATH')) exit; if(!defined('ABSPATH')) exit;
class NamespacedEndpointStub extends APIEndpoint { class APITestNamespacedEndpointStubV1 extends APIEndpoint {
public $permissions = array( public $permissions = array(
'test' => APIAccess::ALL 'test' => APIAccess::ALL
); );

View File

@ -7,7 +7,7 @@ use MailPoet\API\JSON\Endpoint as APIEndpoint;
if(!defined('ABSPATH')) exit; if(!defined('ABSPATH')) exit;
class NamespacedEndpointStub extends APIEndpoint { class APITestNamespacedEndpointStubV2 extends APIEndpoint {
public $permissions = array( public $permissions = array(
'testVersion' => APIAccess::ALL 'testVersion' => APIAccess::ALL
); );

View File

@ -1,10 +1,11 @@
<?php <?php
namespace MailPoet\Test\API\JSON\v1;
use MailPoet\API\JSON\v1\Mailer; use MailPoet\API\JSON\v1\Mailer;
use MailPoet\API\JSON\Response as APIResponse; use MailPoet\API\JSON\Response as APIResponse;
use MailPoet\Mailer\MailerLog; use MailPoet\Mailer\MailerLog;
class MailerEndpointTest extends MailPoetTest { class MailerTest extends \MailPoetTest {
function testItResumesSending() { function testItResumesSending() {
// create mailer log with a "paused" status // create mailer log with a "paused" status
$mailer_log = array('status' => MailerLog::STATUS_PAUSED); $mailer_log = array('status' => MailerLog::STATUS_PAUSED);

View File

@ -1,4 +1,5 @@
<?php <?php
namespace MailPoet\Test\API\MP;
use Codeception\Util\Fixtures; use Codeception\Util\Fixtures;
use Codeception\Util\Stub; use Codeception\Util\Stub;
@ -8,7 +9,7 @@ use MailPoet\Models\Segment;
use MailPoet\Models\SendingQueue; use MailPoet\Models\SendingQueue;
use MailPoet\Models\Subscriber; use MailPoet\Models\Subscriber;
class MPAPITest extends MailPoetTest { class APITest extends \MailPoetTest {
const VERSION = 'v1'; const VERSION = 'v1';
function testItReturnsSubscriberFields() { function testItReturnsSubscriberFields() {
@ -246,7 +247,7 @@ class MPAPITest extends MailPoetTest {
function testItSchedulesWelcomeNotificationByDefaultAfterAddingSubscriber() { function testItSchedulesWelcomeNotificationByDefaultAfterAddingSubscriber() {
$API = Stub::makeEmptyExcept( $API = Stub::makeEmptyExcept(
new MailPoet\API\MP\v1\API(), new \MailPoet\API\MP\v1\API(),
'addSubscriber', 'addSubscriber',
array( array(
'_scheduleWelcomeNotification' => Stub::once() '_scheduleWelcomeNotification' => Stub::once()
@ -261,7 +262,7 @@ class MPAPITest extends MailPoetTest {
function testItDoesNotScheduleWelcomeNotificationAfterAddingSubscriberIfStatusIsNotSubscribed() { function testItDoesNotScheduleWelcomeNotificationAfterAddingSubscriberIfStatusIsNotSubscribed() {
$API = Stub::makeEmptyExcept( $API = Stub::makeEmptyExcept(
new MailPoet\API\MP\v1\API(), new \MailPoet\API\MP\v1\API(),
'addSubscriber', 'addSubscriber',
array( array(
'_scheduleWelcomeNotification' => Stub::never() '_scheduleWelcomeNotification' => Stub::never()
@ -275,7 +276,7 @@ class MPAPITest extends MailPoetTest {
function testItDoesNotScheduleWelcomeNotificationAfterAddingSubscriberWhenDisabledByOption() { function testItDoesNotScheduleWelcomeNotificationAfterAddingSubscriberWhenDisabledByOption() {
$API = Stub::makeEmptyExcept( $API = Stub::makeEmptyExcept(
new MailPoet\API\MP\v1\API(), new \MailPoet\API\MP\v1\API(),
'addSubscriber', 'addSubscriber',
array( array(
'_scheduleWelcomeNotification' => Stub::never() '_scheduleWelcomeNotification' => Stub::never()
@ -291,7 +292,7 @@ class MPAPITest extends MailPoetTest {
function testByDefaultItSendsConfirmationEmailAfterAddingSubscriber() { function testByDefaultItSendsConfirmationEmailAfterAddingSubscriber() {
$API = Stub::makeEmptyExcept( $API = Stub::makeEmptyExcept(
new MailPoet\API\MP\v1\API(), new \MailPoet\API\MP\v1\API(),
'addSubscriber', 'addSubscriber',
array( array(
'_sendConfirmationEmail' => Stub::once() '_sendConfirmationEmail' => Stub::once()
@ -305,7 +306,7 @@ class MPAPITest extends MailPoetTest {
function testItDoesNotSendConfirmationEmailAfterAddingSubscriberWhenOptionIsSet() { function testItDoesNotSendConfirmationEmailAfterAddingSubscriberWhenOptionIsSet() {
$API = Stub::makeEmptyExcept( $API = Stub::makeEmptyExcept(
new MailPoet\API\MP\v1\API(), new \MailPoet\API\MP\v1\API(),
'addSubscriber', 'addSubscriber',
array( array(
'_sendConfirmationEmail' => Stub::never() '_sendConfirmationEmail' => Stub::never()
@ -319,9 +320,9 @@ class MPAPITest extends MailPoetTest {
} }
function _after() { function _after() {
ORM::raw_execute('TRUNCATE ' . Subscriber::$_table); \ORM::raw_execute('TRUNCATE ' . Subscriber::$_table);
ORM::raw_execute('TRUNCATE ' . CustomField::$_table); \ORM::raw_execute('TRUNCATE ' . CustomField::$_table);
ORM::raw_execute('TRUNCATE ' . Segment::$_table); \ORM::raw_execute('TRUNCATE ' . Segment::$_table);
ORM::raw_execute('TRUNCATE ' . SendingQueue::$_table); \ORM::raw_execute('TRUNCATE ' . SendingQueue::$_table);
} }
} }

View File

@ -1,10 +1,11 @@
<?php <?php
namespace MailPoet\Test\Config;
use Codeception\Util\Stub; use Codeception\Util\Stub;
use MailPoet\Config\Database; use MailPoet\Config\Database;
use MailPoet\Config\Env; use MailPoet\Config\Env;
class DatabaseTestTest extends MailPoetTest { class DatabaseTest extends \MailPoetTest {
public $database; public $database;
function __construct() { function __construct() {
@ -32,14 +33,14 @@ class DatabaseTestTest extends MailPoetTest {
function testItSelectivelyUpdatesDriverTimeoutOption() { function testItSelectivelyUpdatesDriverTimeoutOption() {
$database = $this->database; $database = $this->database;
$database->setupDriverOptions(); $database->setupDriverOptions();
$current_setting = ORM::for_table("") $current_setting = \ORM::for_table("")
->raw_query('SELECT @@session.wait_timeout as wait_timeout') ->raw_query('SELECT @@session.wait_timeout as wait_timeout')
->findOne(); ->findOne();
expect($current_setting->wait_timeout)->greaterThan($database->driver_option_wait_timeout); expect($current_setting->wait_timeout)->greaterThan($database->driver_option_wait_timeout);
$this->_before(); $this->_before();
$database->driver_option_wait_timeout = 99999; $database->driver_option_wait_timeout = 99999;
$database->setupDriverOptions(); $database->setupDriverOptions();
$current_setting = ORM::for_table("") $current_setting = \ORM::for_table("")
->raw_query('SELECT @@session.wait_timeout as wait_timeout') ->raw_query('SELECT @@session.wait_timeout as wait_timeout')
->findOne(); ->findOne();
expect($current_setting->wait_timeout)->equals(99999); expect($current_setting->wait_timeout)->equals(99999);
@ -47,7 +48,7 @@ class DatabaseTestTest extends MailPoetTest {
function testItSetsDBDriverOptions() { function testItSetsDBDriverOptions() {
$this->database->init(); $this->database->init();
$result = ORM::for_table("") $result = \ORM::for_table("")
->raw_query( ->raw_query(
'SELECT ' . 'SELECT ' .
'@@sql_mode as sql_mode, ' . '@@sql_mode as sql_mode, ' .

View File

@ -1,4 +1,5 @@
<?php <?php
namespace MailPoet\Test\Config;
use MailPoet\Config\Shortcodes; use MailPoet\Config\Shortcodes;
use MailPoet\Models\Newsletter; use MailPoet\Models\Newsletter;
@ -6,7 +7,7 @@ use MailPoet\Models\SendingQueue;
use MailPoet\Newsletter\Url; use MailPoet\Newsletter\Url;
use MailPoet\Router\Router; use MailPoet\Router\Router;
class ConfigShortcodesTest extends MailPoetTest { class ShortcodesTest extends \MailPoetTest {
function _before() { function _before() {
$newsletter = Newsletter::create(); $newsletter = Newsletter::create();
$newsletter->type = Newsletter::TYPE_STANDARD; $newsletter->type = Newsletter::TYPE_STANDARD;
@ -22,7 +23,7 @@ class ConfigShortcodesTest extends MailPoetTest {
$shortcodes = new Shortcodes(); $shortcodes = new Shortcodes();
// result contains a link pointing to the "view in browser" router endpoint // result contains a link pointing to the "view in browser" router endpoint
$result = $shortcodes->getArchive($params = false); $result = $shortcodes->getArchive($params = false);
$dom = pQuery::parseStr($result); $dom = \pQuery::parseStr($result);
$link = $dom->query('a'); $link = $dom->query('a');
$link = $link->attr('href'); $link = $link->attr('href');
expect($link)->contains('endpoint=view_in_browser'); expect($link)->contains('endpoint=view_in_browser');

View File

@ -2,7 +2,7 @@
namespace MailPoet\Cron\Triggers; namespace MailPoet\Cron\Triggers;
class MockMethod { class CronTriggerMockMethod {
static function run() { static function run() {
return true; return true;
} }

View File

@ -2,7 +2,7 @@
namespace MailPoet\Cron\Triggers; namespace MailPoet\Cron\Triggers;
class MockMethodWithException { class CronTriggerMockMethodWithException {
static function run() { static function run() {
throw new \Exception('Exception thrown'); throw new \Exception('Exception thrown');
} }

View File

@ -28,8 +28,8 @@ class CronTriggerTest extends MailPoetTest {
} }
function testItCanGetCurrentMethod() { function testItCanGetCurrentMethod() {
Setting::setValue(CronTrigger::SETTING_NAME, array('method' => 'MockMethod')); Setting::setValue(CronTrigger::SETTING_NAME, array('method' => 'CronTriggerMockMethod'));
expect($this->cron_trigger->getCurrentMethod())->equals('MockMethod'); expect($this->cron_trigger->getCurrentMethod())->equals('CronTriggerMockMethod');
} }
function testItCanReturnAvailableMethods() { function testItCanReturnAvailableMethods() {
@ -39,7 +39,7 @@ class CronTriggerTest extends MailPoetTest {
function testItCanInitializeCronTriggerMethod() { function testItCanInitializeCronTriggerMethod() {
$cron_trigger = $this->cron_trigger; $cron_trigger = $this->cron_trigger;
$cron_trigger->current_method = 'MockMethod'; $cron_trigger->current_method = 'CronTriggerMockMethod';
expect($cron_trigger->init())->true(); expect($cron_trigger->init())->true();
} }
@ -51,11 +51,11 @@ class CronTriggerTest extends MailPoetTest {
function testItIgnoresExceptionsThrownFromCronTriggerMethods() { function testItIgnoresExceptionsThrownFromCronTriggerMethods() {
$cron_trigger = $this->cron_trigger; $cron_trigger = $this->cron_trigger;
$cron_trigger->current_method = 'MockMethodWithException'; $cron_trigger->current_method = 'CronTriggerMockMethodWithException';
expect($cron_trigger->init())->null(); expect($cron_trigger->init())->null();
} }
function _after() { function _after() {
ORM::raw_execute('TRUNCATE ' . Setting::$_table); \ORM::raw_execute('TRUNCATE ' . Setting::$_table);
} }
} }

View File

@ -1,11 +1,12 @@
<?php <?php
namespace MailPoet\Cron\Triggers;
use MailPoet\API\JSON\Endpoints\Cron; use MailPoet\API\JSON\Endpoints\Cron;
use MailPoet\Cron\CronHelper; use MailPoet\Cron\CronHelper;
use MailPoet\Cron\Triggers\MailPoet; use MailPoet\Cron\Triggers\MailPoet;
use MailPoet\Models\Setting; use MailPoet\Models\Setting;
class MailPoetCronTriggerTest extends MailPoetTest { class MailPoetTest extends \MailPoetTest {
function _before() { function _before() {
// cron trigger is by default set to 'WordPress'; when it runs and does not // 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 // detect any queues to process, it deletes the daemon setting, so Supervisor that's
@ -23,6 +24,6 @@ class MailPoetCronTriggerTest extends MailPoetTest {
} }
function _after() { function _after() {
ORM::raw_execute('TRUNCATE ' . Setting::$_table); \ORM::raw_execute('TRUNCATE ' . Setting::$_table);
} }
} }

View File

@ -1,4 +1,5 @@
<?php <?php
namespace MailPoet\Cron\Triggers;
use Carbon\Carbon; use Carbon\Carbon;
use MailPoet\API\JSON\Endpoints\Cron; use MailPoet\API\JSON\Endpoints\Cron;
@ -9,7 +10,7 @@ use MailPoet\Mailer\MailerLog;
use MailPoet\Models\SendingQueue; use MailPoet\Models\SendingQueue;
use MailPoet\Models\Setting; use MailPoet\Models\Setting;
class WordPressCronTriggerTest extends MailPoetTest { class WordPressTest extends \MailPoetTest {
function _before() { function _before() {
// cron trigger is by default set to 'WordPress'; when it runs and does not // 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 // detect any queues to process, it deletes the daemon setting, so Supervisor that's
@ -116,7 +117,7 @@ class WordPressCronTriggerTest extends MailPoetTest {
} }
function _after() { function _after() {
ORM::raw_execute('TRUNCATE ' . Setting::$_table); \ORM::raw_execute('TRUNCATE ' . Setting::$_table);
ORM::raw_execute('TRUNCATE ' . SendingQueue::$_table); \ORM::raw_execute('TRUNCATE ' . SendingQueue::$_table);
} }
} }

View File

@ -11,6 +11,7 @@ use MailPoet\Services\Bridge\API;
use MailPoet\Util\Helpers; use MailPoet\Util\Helpers;
require_once('BounceTestMockAPI.php'); require_once('BounceTestMockAPI.php');
use MailPoet\Cron\Workers\Bounce\BounceTestMockAPI as MockAPI;
class BounceTest extends MailPoetTest { class BounceTest extends MailPoetTest {
function _before() { function _before() {
@ -29,7 +30,7 @@ class BounceTest extends MailPoetTest {
$this->worker = new Bounce(microtime(true)); $this->worker = new Bounce(microtime(true));
$this->worker->api = new MailPoet\Cron\Workers\Bounce\MockAPI('key'); $this->worker->api = new MockAPI('key');
} }
function testItDefinesConstants() { function testItDefinesConstants() {
@ -124,9 +125,9 @@ class BounceTest extends MailPoetTest {
} }
function _after() { function _after() {
ORM::raw_execute('TRUNCATE ' . Setting::$_table); \ORM::raw_execute('TRUNCATE ' . Setting::$_table);
ORM::raw_execute('TRUNCATE ' . ScheduledTask::$_table); \ORM::raw_execute('TRUNCATE ' . ScheduledTask::$_table);
ORM::raw_execute('TRUNCATE ' . ScheduledTaskSubscriber::$_table); \ORM::raw_execute('TRUNCATE ' . ScheduledTaskSubscriber::$_table);
ORM::raw_execute('TRUNCATE ' . Subscriber::$_table); \ORM::raw_execute('TRUNCATE ' . Subscriber::$_table);
} }
} }

View File

@ -3,7 +3,7 @@ namespace MailPoet\Cron\Workers\Bounce;
if(!defined('ABSPATH')) exit; if(!defined('ABSPATH')) exit;
class MockAPI { class BounceTestMockAPI {
function checkBounces(array $emails) { function checkBounces(array $emails) {
return array_map( return array_map(
function ($email) { function ($email) {

View File

@ -3,7 +3,7 @@ namespace MailPoet\Cron\Workers\KeyCheck;
if(!defined('ABSPATH')) exit; if(!defined('ABSPATH')) exit;
class MockKeyCheckWorker extends KeyCheckWorker { class KeyCheckWorkerMockImplementation extends KeyCheckWorker {
const TASK_TYPE = 'mock_key_check_worker'; const TASK_TYPE = 'mock_key_check_worker';
function checkKey() { function checkKey() {

View File

@ -7,7 +7,7 @@ use MailPoet\Models\Setting;
use MailPoet\Services\Bridge; use MailPoet\Services\Bridge;
require_once('KeyCheckWorkerMockImplementation.php'); require_once('KeyCheckWorkerMockImplementation.php');
use MailPoet\Cron\Workers\KeyCheck\MockKeyCheckWorker; use MailPoet\Cron\Workers\KeyCheck\KeyCheckWorkerMockImplementation as MockKeyCheckWorker;
class KeyCheckWorkerTest extends MailPoetTest { class KeyCheckWorkerTest extends MailPoetTest {
function _before() { function _before() {
@ -65,7 +65,7 @@ class KeyCheckWorkerTest extends MailPoetTest {
} }
function _after() { function _after() {
ORM::raw_execute('TRUNCATE ' . Setting::$_table); \ORM::raw_execute('TRUNCATE ' . Setting::$_table);
ORM::raw_execute('TRUNCATE ' . ScheduledTask::$_table); \ORM::raw_execute('TRUNCATE ' . ScheduledTask::$_table);
} }
} }

View File

@ -1,11 +1,13 @@
<?php <?php
namespace MailPoet\Test\Cron\Workers\SendingQueue\Tasks;
use MailPoet\Cron\Workers\SendingQueue\Tasks\Links; use MailPoet\Cron\Workers\SendingQueue\Tasks\Links;
use MailPoet\Models\Newsletter; use MailPoet\Models\Newsletter;
use MailPoet\Models\NewsletterLink; use MailPoet\Models\NewsletterLink;
if(!defined('ABSPATH')) exit; if(!defined('ABSPATH')) exit;
class LinkTaskTest extends MailPoetTest { class LinksTest extends \MailPoetTest {
function testItCanSaveLinks() { function testItCanSaveLinks() {
$links = array( $links = array(
array( array(
@ -54,7 +56,7 @@ class LinkTaskTest extends MailPoetTest {
} }
function _after() { function _after() {
ORM::raw_execute('TRUNCATE ' . Newsletter::$_table); \ORM::raw_execute('TRUNCATE ' . Newsletter::$_table);
ORM::raw_execute('TRUNCATE ' . NewsletterLink::$_table); \ORM::raw_execute('TRUNCATE ' . NewsletterLink::$_table);
} }
} }

View File

@ -1,4 +1,6 @@
<?php <?php
namespace MailPoet\Test\Cron\Workers\SendingQueue\Tasks;
use Codeception\Util\Stub; use Codeception\Util\Stub;
use MailPoet\Config\Populator; use MailPoet\Config\Populator;
use MailPoet\Cron\Workers\SendingQueue\Tasks\Mailer as MailerTask; use MailPoet\Cron\Workers\SendingQueue\Tasks\Mailer as MailerTask;
@ -8,7 +10,7 @@ use MailPoet\Models\Subscriber;
if(!defined('ABSPATH')) exit; if(!defined('ABSPATH')) exit;
class MailerTaskTest extends MailPoetTest { class MailerTest extends \MailPoetTest {
public $mailer_task; public $mailer_task;
public $sender; public $sender;
@ -22,11 +24,11 @@ class MailerTaskTest extends MailPoetTest {
} }
function testConfiguresMailerWhenItConstructs() { function testConfiguresMailerWhenItConstructs() {
expect($this->mailer_task->mailer instanceof MailPoet\Mailer\Mailer)->true(); expect($this->mailer_task->mailer instanceof \MailPoet\Mailer\Mailer)->true();
} }
function testItCanConfigureMailerWithSenderAndReplyToAddresses() { function testItCanConfigureMailerWithSenderAndReplyToAddresses() {
$newsletter = new stdClass(); $newsletter = new \stdClass();
// when no sender/reply-to information is set, use the sender information // when no sender/reply-to information is set, use the sender information
// from Settings // from Settings
@ -122,7 +124,7 @@ class MailerTaskTest extends MailPoetTest {
} }
function _after() { function _after() {
ORM::raw_execute('TRUNCATE ' . Setting::$_table); \ORM::raw_execute('TRUNCATE ' . Setting::$_table);
ORM::raw_execute('TRUNCATE ' . Subscriber::$_table); \ORM::raw_execute('TRUNCATE ' . Subscriber::$_table);
} }
} }

View File

@ -1,4 +1,5 @@
<?php <?php
namespace MailPoet\Test\Cron\Workers\SendingQueue\Tasks;
use AspectMock\Test as Mock; use AspectMock\Test as Mock;
use Codeception\Util\Fixtures; use Codeception\Util\Fixtures;
@ -15,7 +16,7 @@ use MailPoet\Router\Router;
if(!defined('ABSPATH')) exit; if(!defined('ABSPATH')) exit;
class NewsletterTaskTest extends MailPoetTest { class NewsletterTest extends \MailPoetTest {
function _before() { function _before() {
$this->newsletter_task = new NewsletterTask(); $this->newsletter_task = new NewsletterTask();
$this->subscriber = Subscriber::create(); $this->subscriber = Subscriber::create();
@ -188,7 +189,7 @@ class NewsletterTaskTest extends MailPoetTest {
function testItUpdatesStatusAndSetsSentAtDateOnlyForStandardAndPostNotificationNewsletters() { function testItUpdatesStatusAndSetsSentAtDateOnlyForStandardAndPostNotificationNewsletters() {
$newsletter = $this->newsletter; $newsletter = $this->newsletter;
$queue = new stdClass(); $queue = new \stdClass();
$queue->processed_at = date('Y-m-d H:i:s'); $queue->processed_at = date('Y-m-d H:i:s');
// newsletter type is 'standard' // newsletter type is 'standard'
@ -265,7 +266,7 @@ class NewsletterTaskTest extends MailPoetTest {
try { try {
$this->newsletter_task->preProcessNewsletter($this->newsletter, $queue); $this->newsletter_task->preProcessNewsletter($this->newsletter, $queue);
self::fail('Sending error exception was not thrown.'); self::fail('Sending error exception was not thrown.');
} catch(Exception $e) { } catch(\Exception $e) {
$mailer_log = MailerLog::getMailerLog(); $mailer_log = MailerLog::getMailerLog();
expect($mailer_log['error']['operation'])->equals('queue_save'); expect($mailer_log['error']['operation'])->equals('queue_save');
expect($mailer_log['error']['error_message'])->equals('There was an error processing your newsletter during sending. If possible, please contact us and report this issue.'); expect($mailer_log['error']['error_message'])->equals('There was an error processing your newsletter during sending. If possible, please contact us and report this issue.');
@ -274,7 +275,7 @@ class NewsletterTaskTest extends MailPoetTest {
function testItLogsErrorWhenExistingRenderedNewsletterBodyIsInvalid() { function testItLogsErrorWhenExistingRenderedNewsletterBodyIsInvalid() {
$queue_mock = Mock::double( $queue_mock = Mock::double(
new stdClass(), new \stdClass(),
array( array(
'getNewsletterRenderedBody' => 'a:2:{s:4:"html"' 'getNewsletterRenderedBody' => 'a:2:{s:4:"html"'
) )
@ -282,7 +283,7 @@ class NewsletterTaskTest extends MailPoetTest {
try { try {
$this->newsletter_task->preProcessNewsletter($this->newsletter, $queue_mock); $this->newsletter_task->preProcessNewsletter($this->newsletter, $queue_mock);
self::fail('Sending error exception was not thrown.'); self::fail('Sending error exception was not thrown.');
} catch(Exception $e) { } catch(\Exception $e) {
$mailer_log = MailerLog::getMailerLog(); $mailer_log = MailerLog::getMailerLog();
expect($mailer_log['error']['operation'])->equals('queue_save'); expect($mailer_log['error']['operation'])->equals('queue_save');
expect($mailer_log['error']['error_message'])->equals('There was an error processing your newsletter during sending. If possible, please contact us and report this issue.'); expect($mailer_log['error']['error_message'])->equals('There was an error processing your newsletter during sending. If possible, please contact us and report this issue.');
@ -292,7 +293,7 @@ class NewsletterTaskTest extends MailPoetTest {
function testItLogsErrorWhenNewlyRenderedNewsletterBodyIsInvalid() { function testItLogsErrorWhenNewlyRenderedNewsletterBodyIsInvalid() {
$queue = $this->queue; $queue = $this->queue;
$queue_mock = Mock::double( $queue_mock = Mock::double(
new stdClass(), new \stdClass(),
array( array(
'getNewsletterRenderedBody' => null 'getNewsletterRenderedBody' => null
) )
@ -305,7 +306,7 @@ class NewsletterTaskTest extends MailPoetTest {
try { try {
$this->newsletter_task->preProcessNewsletter($this->newsletter, $queue_mock); $this->newsletter_task->preProcessNewsletter($this->newsletter, $queue_mock);
self::fail('Sending error exception was not thrown.'); self::fail('Sending error exception was not thrown.');
} catch(Exception $e) { } catch(\Exception $e) {
$mailer_log = MailerLog::getMailerLog(); $mailer_log = MailerLog::getMailerLog();
expect($mailer_log['error']['operation'])->equals('queue_save'); expect($mailer_log['error']['operation'])->equals('queue_save');
expect($mailer_log['error']['error_message'])->equals('There was an error processing your newsletter during sending. If possible, please contact us and report this issue.'); expect($mailer_log['error']['error_message'])->equals('There was an error processing your newsletter during sending. If possible, please contact us and report this issue.');
@ -315,7 +316,7 @@ class NewsletterTaskTest extends MailPoetTest {
function testItPreProcessesNewsletterWhenNewlyRenderedNewsletterBodyIsValid() { function testItPreProcessesNewsletterWhenNewlyRenderedNewsletterBodyIsValid() {
$queue = $this->queue; $queue = $this->queue;
$queue_mock = Mock::double( $queue_mock = Mock::double(
new stdClass(), new \stdClass(),
array( array(
'getNewsletterRenderedBody' => null 'getNewsletterRenderedBody' => null
) )
@ -330,10 +331,10 @@ class NewsletterTaskTest extends MailPoetTest {
function _after() { function _after() {
WPHooksHelper::releaseAllHooks(); WPHooksHelper::releaseAllHooks();
ORM::raw_execute('TRUNCATE ' . Subscriber::$_table); \ORM::raw_execute('TRUNCATE ' . Subscriber::$_table);
ORM::raw_execute('TRUNCATE ' . Newsletter::$_table); \ORM::raw_execute('TRUNCATE ' . Newsletter::$_table);
ORM::raw_execute('TRUNCATE ' . SendingQueue::$_table); \ORM::raw_execute('TRUNCATE ' . SendingQueue::$_table);
ORM::raw_execute('TRUNCATE ' . NewsletterLink::$_table); \ORM::raw_execute('TRUNCATE ' . NewsletterLink::$_table);
ORM::raw_execute('TRUNCATE ' . NewsletterPost::$_table); \ORM::raw_execute('TRUNCATE ' . NewsletterPost::$_table);
} }
} }

View File

@ -1,4 +1,5 @@
<?php <?php
namespace MailPoet\Test\Cron\Workers\SendingQueue\Tasks;
use MailPoet\Cron\Workers\SendingQueue\Tasks\Posts as PostsTask; use MailPoet\Cron\Workers\SendingQueue\Tasks\Posts as PostsTask;
use MailPoet\Models\Newsletter; use MailPoet\Models\Newsletter;
@ -6,7 +7,7 @@ use MailPoet\Models\NewsletterPost;
if(!defined('ABSPATH')) exit; if(!defined('ABSPATH')) exit;
class PostsTaskTest extends MailPoetTest { class PostsTest extends \MailPoetTest {
function testItFailsWhenNoPostsArePresent() { function testItFailsWhenNoPostsArePresent() {
$newsletter = (object)array( $newsletter = (object)array(
'id' => 1, 'id' => 1,
@ -49,6 +50,6 @@ class PostsTaskTest extends MailPoetTest {
} }
function _after() { function _after() {
ORM::raw_execute('TRUNCATE ' . NewsletterPost::$_table); \ORM::raw_execute('TRUNCATE ' . NewsletterPost::$_table);
} }
} }

View File

@ -1,11 +1,13 @@
<?php <?php
namespace MailPoet\Test\Cron\Workers\SendingQueue\Tasks;
use MailPoet\Cron\Workers\SendingQueue\Tasks\Shortcodes; use MailPoet\Cron\Workers\SendingQueue\Tasks\Shortcodes;
use MailPoet\Models\Newsletter; use MailPoet\Models\Newsletter;
use MailPoet\Models\SendingQueue; use MailPoet\Models\SendingQueue;
if(!defined('ABSPATH')) exit; if(!defined('ABSPATH')) exit;
class ShortcodesTaskTest extends MailPoetTest { class ShortcodesTest extends \MailPoetTest {
function testItCanReplaceShortcodes() { function testItCanReplaceShortcodes() {
$queue = $newsletter = (object)array( $queue = $newsletter = (object)array(
'id' => 1 'id' => 1
@ -21,7 +23,7 @@ class ShortcodesTaskTest extends MailPoetTest {
} }
function _after() { function _after() {
ORM::raw_execute('TRUNCATE ' . SendingQueue::$_table); \ORM::raw_execute('TRUNCATE ' . SendingQueue::$_table);
ORM::raw_execute('TRUNCATE ' . Newsletter::$_table); \ORM::raw_execute('TRUNCATE ' . Newsletter::$_table);
} }
} }

View File

@ -3,7 +3,7 @@ namespace MailPoet\Cron\Workers;
if(!defined('ABSPATH')) exit; if(!defined('ABSPATH')) exit;
class MockSimpleWorker extends SimpleWorker { class SimpleWorkerMockImplementation extends SimpleWorker {
const TASK_TYPE = 'mock_simple_worker'; const TASK_TYPE = 'mock_simple_worker';
function init() { function init() {

View File

@ -8,7 +8,7 @@ use MailPoet\Models\ScheduledTask;
use MailPoet\Models\Setting; use MailPoet\Models\Setting;
require_once('SimpleWorkerMockImplementation.php'); require_once('SimpleWorkerMockImplementation.php');
use MailPoet\Cron\Workers\MockSimpleWorker; use MailPoet\Cron\Workers\SimpleWorkerMockImplementation as MockSimpleWorker;
class SimpleWorkerTest extends MailPoetTest { class SimpleWorkerTest extends MailPoetTest {
function _before() { function _before() {
@ -193,7 +193,7 @@ class SimpleWorkerTest extends MailPoetTest {
} }
function _after() { function _after() {
ORM::raw_execute('TRUNCATE ' . Setting::$_table); \ORM::raw_execute('TRUNCATE ' . Setting::$_table);
ORM::raw_execute('TRUNCATE ' . ScheduledTask::$_table); \ORM::raw_execute('TRUNCATE ' . ScheduledTask::$_table);
} }
} }

View File

@ -1,4 +1,5 @@
<?php <?php
namespace MailPoet\Test\Newsletter;
use Codeception\Util\Fixtures; use Codeception\Util\Fixtures;
use MailPoet\Newsletter\Renderer\Blocks\Button; use MailPoet\Newsletter\Renderer\Blocks\Button;
@ -12,7 +13,7 @@ use MailPoet\Newsletter\Renderer\Blocks\Text;
use MailPoet\Newsletter\Renderer\Columns\Renderer as ColumnRenderer; use MailPoet\Newsletter\Renderer\Columns\Renderer as ColumnRenderer;
use MailPoet\Newsletter\Renderer\Renderer; use MailPoet\Newsletter\Renderer\Renderer;
class NewsletterRendererTest extends MailPoetTest { class RendererTest extends \MailPoetTest {
function __construct() { function __construct() {
parent::__construct(); parent::__construct();
$this->newsletter = array( $this->newsletter = array(

View File

@ -1,4 +1,5 @@
<?php <?php
namespace MailPoet\Test\Newsletter\Scheduler;
use Carbon\Carbon; use Carbon\Carbon;
use MailPoet\Models\Newsletter; use MailPoet\Models\Newsletter;
@ -8,7 +9,7 @@ use MailPoet\Models\NewsletterPost;
use MailPoet\Models\SendingQueue; use MailPoet\Models\SendingQueue;
use MailPoet\Newsletter\Scheduler\Scheduler; use MailPoet\Newsletter\Scheduler\Scheduler;
class NewsletterSchedulerTest extends MailPoetTest { class SchedulerTest extends \MailPoetTest {
function testItSetsConstants() { function testItSetsConstants() {
expect(Scheduler::SECONDS_IN_HOUR)->notEmpty(); expect(Scheduler::SECONDS_IN_HOUR)->notEmpty();
expect(Scheduler::LAST_WEEKDAY_FORMAT)->notEmpty(); expect(Scheduler::LAST_WEEKDAY_FORMAT)->notEmpty();
@ -468,10 +469,10 @@ class NewsletterSchedulerTest extends MailPoetTest {
} }
function _after() { function _after() {
ORM::raw_execute('TRUNCATE ' . Newsletter::$_table); \ORM::raw_execute('TRUNCATE ' . Newsletter::$_table);
ORM::raw_execute('TRUNCATE ' . NewsletterOption::$_table); \ORM::raw_execute('TRUNCATE ' . NewsletterOption::$_table);
ORM::raw_execute('TRUNCATE ' . NewsletterOptionField::$_table); \ORM::raw_execute('TRUNCATE ' . NewsletterOptionField::$_table);
ORM::raw_execute('TRUNCATE ' . NewsletterPost::$_table); \ORM::raw_execute('TRUNCATE ' . NewsletterPost::$_table);
ORM::raw_execute('TRUNCATE ' . SendingQueue::$_table); \ORM::raw_execute('TRUNCATE ' . SendingQueue::$_table);
} }
} }

View File

@ -1,4 +1,5 @@
<?php <?php
namespace MailPoet\Test\Router\Endpoints;
use Codeception\Util\Stub; use Codeception\Util\Stub;
use MailPoet\Models\Newsletter; use MailPoet\Models\Newsletter;
@ -6,7 +7,7 @@ use MailPoet\Models\SendingQueue;
use MailPoet\Models\Subscriber; use MailPoet\Models\Subscriber;
use MailPoet\Router\Endpoints\ViewInBrowser; use MailPoet\Router\Endpoints\ViewInBrowser;
class ViewInBrowserRouterTest extends MailPoetTest { class ViewInBrowserTest extends \MailPoetTest {
function _before() { function _before() {
// create newsletter // create newsletter
$newsletter = Newsletter::create(); $newsletter = Newsletter::create();
@ -193,9 +194,9 @@ class ViewInBrowserRouterTest extends MailPoetTest {
} }
function _after() { function _after() {
ORM::raw_execute('TRUNCATE ' . Newsletter::$_table); \ORM::raw_execute('TRUNCATE ' . Newsletter::$_table);
ORM::raw_execute('TRUNCATE ' . Subscriber::$_table); \ORM::raw_execute('TRUNCATE ' . Subscriber::$_table);
ORM::raw_execute('TRUNCATE ' . SendingQueue::$_table); \ORM::raw_execute('TRUNCATE ' . SendingQueue::$_table);
// reset WP user role // reset WP user role
$wp_user = wp_get_current_user(); $wp_user = wp_get_current_user();
$wp_user->add_role('administrator'); $wp_user->add_role('administrator');

View File

@ -1,11 +1,12 @@
<?php <?php
namespace MailPoet\Test\Router;
use Codeception\Util\Stub; use Codeception\Util\Stub;
use MailPoet\Router\Router; use MailPoet\Router\Router;
require_once('RouterTestMockEndpoint.php'); require_once('RouterTestMockEndpoint.php');
class FrontRouterTest extends MailPoetTest { class RouterTest extends \MailPoetTest {
public $router_data; public $router_data;
public $router; public $router;
@ -13,7 +14,7 @@ class FrontRouterTest extends MailPoetTest {
parent::__construct(); parent::__construct();
$this->router_data = array( $this->router_data = array(
Router::NAME => '', Router::NAME => '',
'endpoint' => 'mock_endpoint', 'endpoint' => 'router_test_mock_endpoint',
'action' => 'test', 'action' => 'test',
'data' => base64_encode(json_encode(array('data' => 'dummy data'))) 'data' => base64_encode(json_encode(array('data' => 'dummy data')))
); );
@ -133,10 +134,10 @@ class FrontRouterTest extends MailPoetTest {
$data = array('data' => 'dummy data'); $data = array('data' => 'dummy data');
$encoded_data = rtrim(base64_encode(json_encode($data)), '='); $encoded_data = rtrim(base64_encode(json_encode($data)), '=');
$result = Router::buildRequest( $result = Router::buildRequest(
'mock_endpoint', 'router_test_mock_endpoint',
'test', 'test',
$data $data
); );
expect($result)->contains(Router::NAME . '&endpoint=mock_endpoint&action=test&data=' . $encoded_data); expect($result)->contains(Router::NAME . '&endpoint=router_test_mock_endpoint&action=test&data=' . $encoded_data);
} }
} }

View File

@ -2,7 +2,7 @@
namespace MailPoet\Router\Endpoints; namespace MailPoet\Router\Endpoints;
class MockEndpoint { class RouterTestMockEndpoint {
const ACTION_TEST = 'test'; const ACTION_TEST = 'test';
public $allowed_actions = array( public $allowed_actions = array(
self::ACTION_TEST self::ACTION_TEST

View File

@ -7,6 +7,7 @@ use MailPoet\Mailer\Mailer;
use MailPoet\Models\Setting; use MailPoet\Models\Setting;
require_once('BridgeTestMockAPI.php'); require_once('BridgeTestMockAPI.php');
use MailPoet\Services\Bridge\BridgeTestMockAPI as MockAPI;
class BridgeTest extends MailPoetTest { class BridgeTest extends MailPoetTest {
function _before() { function _before() {
@ -20,7 +21,7 @@ class BridgeTest extends MailPoetTest {
$this->bridge = new Bridge(); $this->bridge = new Bridge();
$this->bridge->api = new MailPoet\Services\Bridge\MockAPI('key'); $this->bridge->api = new MockAPI('key');
} }
function testItChecksIfCurrentSendingMethodIsMailpoet() { function testItChecksIfCurrentSendingMethodIsMailpoet() {

View File

@ -5,7 +5,7 @@ use Carbon\Carbon;
if(!defined('ABSPATH')) exit; if(!defined('ABSPATH')) exit;
class MockAPI { class BridgeTestMockAPI {
public $api_key; public $api_key;
function __construct($api_key) { function __construct($api_key) {

View File

@ -1,4 +1,5 @@
<?php <?php
namespace MailPoet\Test\Subscription;
use AspectMock\Test as Mock; use AspectMock\Test as Mock;
use MailPoet\Models\Form as FormModel; use MailPoet\Models\Form as FormModel;
@ -8,7 +9,7 @@ use MailPoet\Models\Subscriber as SubscriberModel;
use MailPoet\Subscription\Form; use MailPoet\Subscription\Form;
use MailPoet\Util\Security; use MailPoet\Util\Security;
class SubscriptionFormSubmissionTest extends MailPoetTest { class FormTest extends \MailPoetTest {
function _before() { function _before() {
$this->segment = SegmentModel::createOrUpdate( $this->segment = SegmentModel::createOrUpdate(
array( array(
@ -101,9 +102,9 @@ class SubscriptionFormSubmissionTest extends MailPoetTest {
function _after() { function _after() {
Mock::clean(); Mock::clean();
wp_delete_post($this->post); wp_delete_post($this->post);
ORM::raw_execute('TRUNCATE ' . SegmentModel::$_table); \ORM::raw_execute('TRUNCATE ' . SegmentModel::$_table);
ORM::raw_execute('TRUNCATE ' . FormModel::$_table); \ORM::raw_execute('TRUNCATE ' . FormModel::$_table);
ORM::raw_execute('TRUNCATE ' . SubscriberModel::$_table); \ORM::raw_execute('TRUNCATE ' . SubscriberModel::$_table);
ORM::raw_execute('TRUNCATE ' . SettingModel::$_table); \ORM::raw_execute('TRUNCATE ' . SettingModel::$_table);
} }
} }

View File

@ -1,11 +1,12 @@
<?php <?php
namespace MailPoet\Test\Util\License\Features;
use Codeception\Util\Fixtures; use Codeception\Util\Fixtures;
use Codeception\Util\Stub; use Codeception\Util\Stub;
use MailPoet\Models\Subscriber; use MailPoet\Models\Subscriber;
use MailPoet\Util\License\Features\Subscribers as SubscribersFeature; use MailPoet\Util\License\Features\Subscribers as SubscribersFeature;
class SubscribersFeaturesTest extends MailPoetTest { class SubscribersTest extends \MailPoetTest {
function testChecksIfSubscribersWithinLimitWhenPremiumLicenseDoesNotExist() { function testChecksIfSubscribersWithinLimitWhenPremiumLicenseDoesNotExist() {
// if premium unlocker plugin is enabled, skip this check // if premium unlocker plugin is enabled, skip this check
if(defined('MAILPOET_PREMIUM_LICENSE')) return; if(defined('MAILPOET_PREMIUM_LICENSE')) return;
@ -31,6 +32,6 @@ class SubscribersFeaturesTest extends MailPoetTest {
} }
function _after() { function _after() {
ORM::raw_execute('TRUNCATE ' . Subscriber::$_table); \ORM::raw_execute('TRUNCATE ' . Subscriber::$_table);
} }
} }

View File

@ -1,7 +1,9 @@
<?php <?php
namespace MailPoet\Test\Util;
use MailPoet\Util\Url; use MailPoet\Util\Url;
class UtilUrlTest extends MailPoetTest { class UrlTest extends \MailPoetTest {
function testItCanReturnCurrentUrl() { function testItCanReturnCurrentUrl() {
$current_url = Url::getCurrentUrl(); $current_url = Url::getCurrentUrl();
expect($current_url)->startsWith('http'); expect($current_url)->startsWith('http');

View File

@ -1,8 +1,9 @@
<?php <?php
namespace MailPoet\Test\WP;
use MailPoet\WP\Hooks; use MailPoet\WP\Hooks;
class WPHooksTest extends MailPoetTest { class HooksTest extends \MailPoetTest {
function _before() { function _before() {
$this->action = 'mailpoet_test_action'; $this->action = 'mailpoet_test_action';
$this->filter = 'mailpoet_test_filter'; $this->filter = 'mailpoet_test_filter';
@ -10,7 +11,7 @@ class WPHooksTest extends MailPoetTest {
function testItCanProcessActions() { function testItCanProcessActions() {
$test_value = array('abc', 'def'); $test_value = array('abc', 'def');
$test_value2 = new StdClass; $test_value2 = new \stdClass;
$called = false; $called = false;
$callback = function ($value, $value2) use ($test_value, $test_value2, &$called) { $callback = function ($value, $value2) use ($test_value, $test_value2, &$called) {

View File

@ -1,9 +1,10 @@
<?php <?php
namespace MailPoet\Test\WP;
use Helper\WordPress as WordPressHelper; use Helper\WordPress as WordPressHelper;
use MailPoet\WP\Posts; use MailPoet\WP\Posts;
class WPPostsTest extends MailPoetTest { class PostsTest extends \MailPoetTest {
function testGetTermsProxiesCallToWordPress() { function testGetTermsProxiesCallToWordPress() {
$args = array( $args = array(