Skip to content

Commit

Permalink
Fixing part of a failing test
Browse files Browse the repository at this point in the history
  • Loading branch information
lorenzo committed Oct 27, 2014
1 parent 46afe0b commit 016a472
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion tests/TestCase/ORM/MarshallerTest.php
Expand Up @@ -786,8 +786,15 @@ public function testMergeMultipleAssociations() {
$this->assertSame($comment2, $entity->comments[1]);
$this->assertEquals('Altered comment 1', $entity->comments[0]->comment);
$this->assertEquals('Altered comment 2', $entity->comments[1]->comment);

$thirdComment = $this->articles->Comments
->find()
->where(['id' => 3])
->hydrate(false)
->first();

$this->assertEquals(
['comment' => 'Extra comment 3', 'id' => 3],
['comment' => 'Extra comment 3'] + $thirdComment,
$entity->comments[2]->toArray()
);
$this->assertEquals(
Expand Down

0 comments on commit 016a472

Please sign in to comment.