Merge branch '2.1' into 2.2

This commit is contained in:
mark_story 2012-04-26 22:27:44 -04:00
commit 46bce1a00f
6 changed files with 37 additions and 19 deletions
lib/Cake/Test/Case/Model

View file

@ -3304,8 +3304,8 @@ class ModelWriteTest extends BaseModelTest {
$expected = array(
'Article' => true,
'Comment' => array(
true,
true
true,
true
)
);
$this->assertSame($expected, $result);
@ -3323,8 +3323,8 @@ class ModelWriteTest extends BaseModelTest {
$expected = array(
'Article' => true,
'Comment' => array(
false,
true
false,
true
)
);
$this->assertSame($expected, $result);
@ -3363,8 +3363,8 @@ class ModelWriteTest extends BaseModelTest {
$expected = array(
'Article' => true,
'Comment' => array(
true,
true
true,
true
)
);
$this->assertSame($expected, $result);
@ -3381,8 +3381,8 @@ class ModelWriteTest extends BaseModelTest {
$expected = array(
'Article' => true,
'Comment' => array(
true,
false
true,
false
)
);
$this->assertSame($expected, $result);
@ -3730,8 +3730,8 @@ class ModelWriteTest extends BaseModelTest {
$expected = array(
'Article' => true,
'Comment' => array(
true,
true
true,
true
)
);
$this->assertSame($expected, $result);
@ -3759,8 +3759,8 @@ class ModelWriteTest extends BaseModelTest {
$expected = array(
'Article' => true,
'Comment' => array(
true,
true
true,
true
)
);
$this->assertSame($expected, $result);