Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fix failing tests caused by previous commit.

  • Loading branch information...
commit 6d6ac1083425ecc4e0efe4be6ce98d8cea6a2989 1 parent 58a2ee0
@markstory markstory authored
View
2  lib/Cake/Console/Command/Task/FixtureTask.php
@@ -279,7 +279,7 @@ public function getPath() {
*/
protected function _generateSchema($tableInfo) {
$schema = $this->_Schema->generateTable('f', $tableInfo);
- return substr($schema, 10, -2);
+ return substr($schema, 13, -2);
}
/**
View
12 lib/Cake/Test/Case/Console/Command/SchemaShellTest.php
@@ -353,12 +353,12 @@ public function testGenerateWithPlugins() {
$contents = $this->file->read();
$this->assertRegExp('/class TestPluginSchema/', $contents);
- $this->assertRegExp('/var \$posts/', $contents);
- $this->assertRegExp('/var \$auth_users/', $contents);
- $this->assertRegExp('/var \$authors/', $contents);
- $this->assertRegExp('/var \$test_plugin_comments/', $contents);
- $this->assertNotRegExp('/var \$users/', $contents);
- $this->assertNotRegExp('/var \$articles/', $contents);
+ $this->assertRegExp('/public \$posts/', $contents);
+ $this->assertRegExp('/public \$auth_users/', $contents);
+ $this->assertRegExp('/public \$authors/', $contents);
+ $this->assertRegExp('/public \$test_plugin_comments/', $contents);
+ $this->assertNotRegExp('/public \$users/', $contents);
+ $this->assertNotRegExp('/public \$articles/', $contents);
CakePlugin::unload();
}
View
1  lib/Cake/Test/Case/Console/Command/Task/FixtureTaskTest.php
@@ -21,6 +21,7 @@
App::uses('Shell', 'Console');
App::uses('ConsoleOutput', 'Console');
App::uses('ConsoleInput', 'Console');
+App::uses('ModelTask', 'Console/Command/Task');
App::uses('FixtureTask', 'Console/Command/Task');
App::uses('TemplateTask', 'Console/Command/Task');
App::uses('DbConfigTask', 'Console/Command/Task');
View
2  lib/Cake/Test/Case/Model/CakeSchemaTest.php
@@ -741,7 +741,7 @@ public function testGenerateTable() {
'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => true)),
);
$result = $this->Schema->generateTable('posts', $posts);
- $this->assertRegExp('/var \$posts/', $result);
+ $this->assertRegExp('/public \$posts/', $result);
}
/**
* testSchemaWrite method
Please sign in to comment.
Something went wrong with that request. Please try again.