Fixed PHPUnit include bug.

Fixed vendor include path bug.
cakephp · Mar 13, 2013 · 5038e7e · 5038e7e
1 parent 73310f9
commit 5038e7e
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/lib/Cake/TestSuite/CakeTestSuiteDispatcher.php b/lib/Cake/TestSuite/CakeTestSuiteDispatcher.php
@@ -138,13 +138,14 @@ protected function _checkPHPUnit() {
  */
 	public function loadTestFramework() {
 		foreach (App::path('vendors') as $vendor) {
-			if (is_dir($vendor . 'PHPUnit')) {
+      $vendor = rtrim($vendor, DS);
+			if (is_dir($vendor . DS . 'PHPUnit')) {
 				ini_set('include_path', $vendor . PATH_SEPARATOR . ini_get('include_path'));
 				break;
 			}
 		}
 
-		return include 'PHPUnit' . DS . 'Autoload.php';
+		return (include('PHPUnit' . DS . 'Autoload.php')) !== false;
 	}
 
 /**