Merge branch '2.0' into 2.1

Conflicts:
	lib/Cake/Model/CakeSchema.php
This commit is contained in:
mark_story 2012-02-26 12:04:28 -05:00
commit 0568746bfd
7 changed files with 16 additions and 39 deletions

View file

@ -188,7 +188,7 @@ class SchemaShellTest extends CakeTestCase {
$this->Shell->args = array('TestPlugin.schema');
$this->Shell->startup();
$this->Shell->expects($this->exactly(2))->method('_stop');
$this->Shell->expects($this->exactly(2))->method('out');
$this->Shell->expects($this->atLeastOnce())->method('out');
$this->Shell->view();
$this->Shell->args = array();