Fixing fixture loading after recent changes in App::core()

cakephp · Mar 12, 2011 · 96fa5e7 · 96fa5e7
1 parent fea2ac2
commit 96fa5e7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/lib/Cake/TestSuite/CakeTestRunner.php b/lib/Cake/TestSuite/CakeTestRunner.php
@@ -80,7 +80,8 @@ protected function createTestResult() {
  */
 	protected function _getFixtureManager($arguments) {
 		if (isset($arguments['fixtureManager'])) {
-			if (App::import('Lib', 'test_suite/' . Inflector::underscore($arguments['fixtureManager']))) {
+			App::uses($arguments['fixtureManager'], 'TestSuite');
+			if (class_exists($arguments['fixtureManager'])) {
 				return new $arguments['fixtureManager'];
 			}
 			throw new RuntimeException(__('Could not find fixture manager %s.', $arguments['fixtureManager']));

diff --git a/lib/Cake/TestSuite/Fixture/CakeFixtureManager.php b/lib/Cake/TestSuite/Fixture/CakeFixtureManager.php
@@ -105,9 +105,7 @@ protected function _loadFixtures($fixtures) {
 
 			if (strpos($fixture, 'core.') === 0) {
 				$fixture = substr($fixture, strlen('core.'));
-				foreach (App::core('cake') as $key => $path) {
-					$fixturePaths[] = $path . 'tests' . DS . 'fixtures';
-				}
+				$fixturePaths[] = LIBS . 'tests' . DS . 'fixtures';
 			} elseif (strpos($fixture, 'app.') === 0) {
 				$fixture = substr($fixture, strlen('app.'));
 				$fixturePaths = array(