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

Updating controller group.
cakephp · Oct 31, 2009 · 5124490 · 5124490
1 parent 6b616b7
commit 5124490
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/cake/tests/cases/libs/controller/controller_merge_vars.test.php b/cake/tests/cases/libs/controller/controller_merge_vars.test.php
@@ -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
  *

diff --git a/cake/tests/groups/controller.group.php b/cake/tests/groups/controller.group.php
@@ -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');
 	}
 }
 ?>