Skip to content

Commit 456645d

Browse files
committed
Update tests for incorrect containable behaviour if a model only finds 1 field.
1 parent 940a51b commit 456645d

File tree

1 file changed

+59
-0
lines changed

1 file changed

+59
-0
lines changed

lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -682,6 +682,65 @@ public function testFindSecondLevel() {
682682
);
683683
$this->assertEquals($expected, $result);
684684

685+
$this->Article->contain(array('User' => array('id', 'ArticleFeatured')));
686+
$result = $this->Article->find('all', array('recursive' => 2));
687+
$expected = array(
688+
array(
689+
'Article' => array(
690+
'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
691+
'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
692+
),
693+
'User' => array(
694+
'id' => 1,
695+
'ArticleFeatured' => array(
696+
array(
697+
'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
698+
'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
699+
),
700+
array(
701+
'id' => 3, 'user_id' => 1, 'title' => 'Third Article', 'body' => 'Third Article Body',
702+
'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31'
703+
)
704+
)
705+
)
706+
),
707+
array(
708+
'Article' => array(
709+
'id' => 2, 'user_id' => 3, 'title' => 'Second Article', 'body' => 'Second Article Body',
710+
'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'
711+
),
712+
'User' => array(
713+
'id' => 3,
714+
'ArticleFeatured' => array(
715+
array(
716+
'id' => 2, 'user_id' => 3, 'title' => 'Second Article', 'body' => 'Second Article Body',
717+
'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'
718+
)
719+
)
720+
)
721+
),
722+
array(
723+
'Article' => array(
724+
'id' => 3, 'user_id' => 1, 'title' => 'Third Article', 'body' => 'Third Article Body',
725+
'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31'
726+
),
727+
'User' => array(
728+
'id' => 1,
729+
'ArticleFeatured' => array(
730+
array(
731+
'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
732+
'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
733+
),
734+
array(
735+
'id' => 3, 'user_id' => 1, 'title' => 'Third Article', 'body' => 'Third Article Body',
736+
'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31'
737+
)
738+
)
739+
)
740+
)
741+
);
742+
$this->assertEquals($expected, $result);
743+
685744
$this->Article->contain(array('User' => array('ArticleFeatured', 'Comment')));
686745
$result = $this->Article->find('all', array('recursive' => 2));
687746
$expected = array(

0 commit comments

Comments
 (0)