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

- Updates action names

Browse Source
This commit is contained in:
Vlad
2017-01-11 20:53:28 -05:00
parent 39a6318105
commit 5800883416
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Config/Menu.php
View File

@@ -41,8 +41,8 @@ class Menu {
function setup() { function setup() {
if(!empty($_REQUEST['page']) && preg_match('/mailpoet-/i', $_REQUEST['page'])) { if(!empty($_REQUEST['page']) && preg_match('/mailpoet-/i', $_REQUEST['page'])) {
do_action('mailpoet_conflict_styles'); do_action('mailpoet_conflict_resolver_styles');
do_action('mailpoet_conflict_scripts'); do_action('mailpoet_conflict_resolver_scripts');
} }
$main_page_slug = 'mailpoet-newsletters'; $main_page_slug = 'mailpoet-newsletters';

2
lib/Router/Router.php
View File

@@ -37,7 +37,7 @@ class Router {
if(!method_exists($endpoint, $this->action) || !in_array($this->action, $endpoint->allowed_actions)) { if(!method_exists($endpoint, $this->action) || !in_array($this->action, $endpoint->allowed_actions)) {
return $this->terminateRequest(self::RESPONSE_ERROR, __('Invalid router endpoint action.', 'mailpoet')); return $this->terminateRequest(self::RESPONSE_ERROR, __('Invalid router endpoint action.', 'mailpoet'));
} }
do_action('mailpoet_conflict_url_query_parameters'); do_action('mailpoet_conflict_resolver_router_url_query_parameters');
return call_user_func( return call_user_func(
array( array(
$endpoint, $endpoint,

6
lib/Util/ConflictResolver.php
View File

@@ -8,9 +8,9 @@ class ConflictResolver {
); );
function init() { function init() {
add_action('mailpoet_conflict_url_query_parameters', array($this, 'resolveRouterUrlQueryParametersConflict')); add_action('mailpoet_conflict_resolver_router_url_query_parameters', array($this, 'resolveRouterUrlQueryParametersConflict'));
add_action('mailpoet_conflict_styles', array($this, 'resolveStylesConflict')); add_action('mailpoet_conflict_resolver_styles', array($this, 'resolveStylesConflict'));
add_action('mailpoet_conflict_scripts', array($this, 'resolveScriptsConflict')); add_action('mailpoet_conflict_resolver_scripts', array($this, 'resolveScriptsConflict'));
} }
function resolveRouterUrlQueryParametersConflict() { function resolveRouterUrlQueryParametersConflict() {

2
tests/unit/Router/RouterTest.php
View File

@@ -99,7 +99,7 @@ class FrontRouterTest extends MailPoetTest {
function testItExecutesUrlParameterConflictResolverAction() { function testItExecutesUrlParameterConflictResolverAction() {
$data = array('data' => 'dummy data'); $data = array('data' => 'dummy data');
$result = $this->router->init(); $result = $this->router->init();
expect((boolean) did_action('mailpoet_conflict_url_query_parameters'))->true(); expect((boolean) did_action('mailpoet_conflict_resolver_router_url_query_parameters'))->true();
} }
function testItCanEncodeRequestData() { function testItCanEncodeRequestData() {

8
tests/unit/Util/ConflictResolverTest.php
View File

@@ -13,17 +13,17 @@ class ConflictResolverTest extends MailPoetTest {
} }
function testItResolvesRouterUrlQueryParametersConflict() { function testItResolvesRouterUrlQueryParametersConflict() {
expect(!empty($this->wp_filter['mailpoet_conflict_url_query_parameters']))->true(); expect(!empty($this->wp_filter['mailpoet_conflict_resolver_router_url_query_parameters']))->true();
// it should unset action & endpoint GET variables // it should unset action & endpoint GET variables
$_GET['endpoint'] = $_GET['action'] = $_GET['test'] = 'test'; $_GET['endpoint'] = $_GET['action'] = $_GET['test'] = 'test';
do_action('mailpoet_conflict_url_query_parameters'); do_action('mailpoet_conflict_resolver_router_url_query_parameters');
expect(empty($_GET['endpoint']))->true(); expect(empty($_GET['endpoint']))->true();
expect(empty($_GET['action']))->true(); expect(empty($_GET['action']))->true();
expect(empty($_GET['test']))->false(); expect(empty($_GET['test']))->false();
} }
function testItUnloadsConflictingStyles() { function testItUnloadsConflictingStyles() {
expect(!empty($this->wp_filter['mailpoet_conflict_styles']))->true(); expect(!empty($this->wp_filter['mailpoet_conflict_resolver_styles']))->true();
wp_enqueue_style('select2', 'select2.css'); wp_enqueue_style('select2', 'select2.css');
wp_enqueue_style('select-2', 'select-2.css'); wp_enqueue_style('select-2', 'select-2.css');
wp_enqueue_style('test', 'test.css'); wp_enqueue_style('test', 'test.css');
@@ -41,7 +41,7 @@ class ConflictResolverTest extends MailPoetTest {
} }
function testItUnloadsConflictingScripts() { function testItUnloadsConflictingScripts() {
expect(!empty($this->wp_filter['mailpoet_conflict_scripts']))->true(); expect(!empty($this->wp_filter['mailpoet_conflict_resolver_scripts']))->true();
wp_enqueue_script('select2', 'select2.js'); wp_enqueue_script('select2', 'select2.js');
wp_enqueue_script('select-2', 'select-2.js', null, null, $in_footer = true); wp_enqueue_script('select-2', 'select-2.js', null, null, $in_footer = true);
wp_enqueue_script('test', 'test.js'); wp_enqueue_script('test', 'test.js');