Removed unnecessary imports and ensured model import. Fixes #1453

cakephp · Jan 21, 2011 · 68799c9 · 68799c9
1 parent 46d14c5
commit 68799c9
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/cake/tests/cases/libs/controller_test_case.test.php b/cake/tests/cases/libs/controller_test_case.test.php
@@ -18,10 +18,6 @@
  * @since         CakePHP v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Controller', 'Controller', false);
-App::import('Core', array('AppModel', 'Model'));
-require_once TEST_CAKE_CORE_INCLUDE_PATH  . 'tests' . DS . 'lib' . DS . 'reporter' . DS . 'cake_html_reporter.php';
-require_once dirname(__FILE__) . DS . 'model' . DS . 'models.php';
 
 /**
  * AppController class

diff --git a/cake/tests/lib/controller_test_case.php b/cake/tests/lib/controller_test_case.php
@@ -276,6 +276,7 @@ public function generate($controller, $mocks = array()) {
 			if ($methods === true) {
 				$methods = array();
 			}
+			ClassRegistry::init($model);
 			list($plugin, $name) = pluginSplit($model);
 			$config = array_merge((array)$config, array('name' => $model));
 			$_model = $this->getMock($name, $methods, array($config));