Fixing bake's unit test detection so it checks for PHPUnit properly.

Fixes #1505
cakephp · Feb 5, 2011 · 8e267f7 · 8e267f7
1 parent 7b34d87
commit 8e267f7
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/cake/console/shells/shell.php b/cake/console/shells/shell.php
@@ -628,7 +628,10 @@ public function createFile($path, $contents) {
  * @return boolean Success
  */
 	protected function _checkUnitTest() {
-		if (App::import('vendor', 'simpletest' . DS . 'simpletest')) {
+		if (App::import('Vendor', 'phpunit', array('file' => 'PHPUnit' . DS . 'Autoload.php'))) {
+			return true;
+		}
+		if (@include 'PHPUnit' . DS . 'Autoload.php') {
 			return true;
 		}
 		$prompt = 'PHPUnit is not installed. Do you want to bake unit test files anyway?';