Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1472 from franzliedke/patch-61 

Fix pull request #1467
This commit is contained in:
Dayle Rees 2012-11-27 05:44:45 -08:00
parent cac58db390 f0cd43a20d
commit 6ae889e5b8
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
laravel/tests/cases/eloquent.test.php
View File

@ -272,7 +272,7 @@ public function testConvertingToArray()
$model->relationships['one'] = new Model(array('foo' => 'bar', 'password' => 'hidden')); $model->relationships['one'] = new Model(array('foo' => 'bar', 'password' => 'hidden'));
$model->relationships['many'] = array($first, $second, $third); $model->relationships['many'] = array($first, $second, $third);
$model->relationships['hidden'] = new Model(array('should' => 'visible')); $model->relationships['hidden'] = new Model(array('should' => 'not_visible'));
$model->relationships['null'] = null; $model->relationships['null'] = null;
$this->assertEquals(array( $this->assertEquals(array(
@ -283,7 +283,6 @@ public function testConvertingToArray()
array('second' => 'bar'), array('second' => 'bar'),
array('third' => 'baz'), array('third' => 'baz'),
), ),
'hidden' => array('should' => 'visible'),
'null' => null, 'null' => null,
), $model->to_array()); ), $model->to_array());