Skip to content
Permalink
Browse files

Updating merge vars test to skip itself if run in a group context.

Updating controller group.
  • Loading branch information...
markstory committed Oct 31, 2009
1 parent 6b616b7 commit 51244907d1e9e754528e3e66a88ac7366024890b
@@ -124,7 +124,14 @@ class MergePostsController extends MergeVarPluginAppController {
* @package cake.tests.cases.libs.controller
**/
class ControllerMergeVarsTestCase 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
*
@@ -49,6 +49,7 @@ function ControllerGroupTest() {
TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'controller' . DS . 'scaffold');
TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'controller' . DS . 'pages_controller');
TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'controller' . DS . 'component');
TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'controller' . DS . 'controller_merge_vars');
}
}
?>

0 comments on commit 5124490

Please sign in to comment.
You can’t perform that action at this time.