diff --git a/cake/tests/cases/libs/controller/controller_merge_vars.test.php b/cake/tests/cases/libs/controller/controller_merge_vars.test.php index 3ee4717e9ae..ffb4f25a90e 100644 --- a/cake/tests/cases/libs/controller/controller_merge_vars.test.php +++ b/cake/tests/cases/libs/controller/controller_merge_vars.test.php @@ -128,14 +128,6 @@ class MergePostsController extends MergeVarPluginAppController { * @package cake.tests.cases.libs.controller */ class ControllerMergeVarsTest extends CakeTestCase { -/** - * Skips the case if APP_CONTROLLER_EXISTS is defined - * - * @return void - */ - function skip() { - $this->skipIf(defined('APP_CONTROLLER_EXISTS'), 'APP_CONTROLLER_EXISTS cannot run. %s'); - } /** * end test * @@ -151,6 +143,8 @@ function endTest() { * @return void */ function testComponentParamMergingNoDuplication() { + $this->skipIf(defined('APP_CONTROLLER_EXISTS'), "APP_CONTROLLER_EXISTS cannot run {$this->name}"); + $Controller =& new MergeVariablesController(); $Controller->constructClasses(); @@ -164,6 +158,8 @@ function testComponentParamMergingNoDuplication() { * @return void */ function testComponentMergingWithRedeclarations() { + $this->skipIf(defined('APP_CONTROLLER_EXISTS'), "APP_CONTROLLER_EXISTS cannot run {$this->name}"); + $Controller =& new MergeVariablesController(); $Controller->components['MergeVar'] = array('remote', 'redirect' => true); $Controller->constructClasses(); @@ -178,6 +174,8 @@ function testComponentMergingWithRedeclarations() { * @return void */ function testHelperSettingMergingNoDuplication() { + $this->skipIf(defined('APP_CONTROLLER_EXISTS'), "APP_CONTROLLER_EXISTS cannot run {$this->name}"); + $Controller =& new MergeVariablesController(); $Controller->constructClasses(); @@ -191,6 +189,8 @@ function testHelperSettingMergingNoDuplication() { * @return void */ function testMergeVarsWithPlugin() { + $this->skipIf(defined('APP_CONTROLLER_EXISTS'), "APP_CONTROLLER_EXISTS cannot run {$this->name}"); + $Controller =& new MergePostsController(); $Controller->components = array('Email' => array('ports' => 'open')); $Controller->plugin = 'MergeVarPlugin'; @@ -228,6 +228,8 @@ function testMergeVarsWithPlugin() { * @return void */ function testMergeVarsNotGreedy() { + $this->skipIf(defined('APP_CONTROLLER_EXISTS'), "APP_CONTROLLER_EXISTS cannot run {$this->name}"); + $Controller =& new Controller(); $Controller->components = array(); $Controller->uses = array();