|
|
@@ -137,6 +137,9 @@ class CakeTestSuiteDispatcher {
|
|
|
* @return boolean true if found, false otherwise
|
|
|
*/
|
|
|
public function loadTestFramework() {
|
|
|
+ if (class_exists('PHPUnit_Framework_TestCase')) {
|
|
|
+ return true;
|
|
|
+ }
|
|
|
foreach (App::path('vendors') as $vendor) {
|
|
|
$vendor = rtrim($vendor, DS);
|
|
|
if (is_dir($vendor . DS . 'PHPUnit')) {
|
|
|
@@ -144,8 +147,8 @@ class CakeTestSuiteDispatcher {
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
- return (include ('PHPUnit' . DS . 'Autoload.php')) !== false;
|
|
|
+ include 'PHPUnit' . DS . 'Autoload.php';
|
|
|
+ return class_exists('PHPUnit_Framework_TestCase');
|
|
|
}
|
|
|
|
|
|
/**
|