Skip to content

U
UserAdminV2
Commit 6ae889e5 by Dayle Rees
Options

Merge pull request #1472 from franzliedke/patch-61 

Fix pull request #1467
parents cac58db3 f0cd43a2
Showing with 1 additions and 2 deletions
laravel/tests/cases/eloquent.test.php
...@@ -272,7 +272,7 @@ class EloquentTest extends PHPUnit_Framework_TestCase { ...@@ -272,7 +272,7 @@ class EloquentTest extends PHPUnit_Framework_TestCase {
$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 @@ class EloquentTest extends PHPUnit_Framework_TestCase { ...@@ -283,7 +283,6 @@ class EloquentTest extends PHPUnit_Framework_TestCase {
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());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment