Making CakeSchema tests pass

cakephp · Jan 9, 2011 · cd28f19 · cd28f19
1 parent be83288
commit cd28f19
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/lib/Cake/Model/CakeSchema.php b/lib/Cake/Model/CakeSchema.php
@@ -219,19 +219,21 @@ public function read($options = array()) {
 
 		if (!is_array($models) && $models !== false) {
 			if (isset($this->plugin)) {
-				$models = App::objects('model', App::pluginPath($this->plugin) . 'models' . DS, false);
+				$models = App::objects($this->plugin . '.Model', null, false);
 			} else {
-				$models = App::objects('model');
+				$models = App::objects('Model');
 			}
 		}
 
 		if (is_array($models)) {
 			foreach ($models as $model) {
 				$importModel = $model;
+				$plugin = null;
 				if (isset($this->plugin)) {
-					$importModel = $this->plugin . '.' . $model;
+					$importModel = $model;
+					$plugin = $this->plugin . '.';
 				}
-				App::uses($importModel, 'Model');
+				App::uses($importModel, $plugin . 'Model');
 				if (!class_exists($importModel)) {
 					continue;
 				}

diff --git a/lib/Cake/tests/cases/libs/model/cake_schema.test.php b/lib/Cake/tests/cases/libs/model/cake_schema.test.php
@@ -19,6 +19,7 @@
  */
 
 App::uses('CakeSchema', 'Model');
+App::uses('CakeTestFixture', 'TestSuite/Fixture');
 
 /**
  * Test for Schema database management
@@ -632,7 +633,7 @@ function testSchemaReadWithTablePrefix() {
  * @return void
  */
 	function testSchemaReadWithConfigPrefix() {
-		$db =& ConnectionManager::getDataSource('test');
+		$db = ConnectionManager::getDataSource('test');
 		$config = $db->config;
 		$config['prefix'] = 'schema_test_prefix_';
 		ConnectionManager::create('schema_prefix', $config);