Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Remove added fixtures and use existing. Updated one old test to add d…
…ata from afterFind callback
  • Loading branch information
k-halaburda committed Aug 16, 2013
1 parent bb7ff48 commit d7dab32
Show file tree
Hide file tree
Showing 7 changed files with 272 additions and 358 deletions.
66 changes: 45 additions & 21 deletions lib/Cake/Test/Case/Model/ModelIntegrationTest.php
Expand Up @@ -1708,7 +1708,8 @@ public function testWithAssociation() {
'body' => 'First Post Body',
'published' => 'Y',
'created' => '2007-03-18 10:39:23',
'updated' => '2007-03-18 10:41:31'
'updated' => '2007-03-18 10:41:31',
'afterFind' => 'Successfuly added by AfterFind'
),
'Something' => array(
array(
Expand All @@ -1724,7 +1725,8 @@ public function testWithAssociation() {
'something_else_id' => '1',
'doomed' => true,
'created' => '2007-03-18 10:43:23',
'updated' => '2007-03-18 10:45:31'
'updated' => '2007-03-18 10:45:31',
'afterFind' => 'Successfuly added by AfterFind'
)))),
array(
'SomethingElse' => array(
Expand All @@ -1733,7 +1735,8 @@ public function testWithAssociation() {
'body' => 'Second Post Body',
'published' => 'Y',
'created' => '2007-03-18 10:41:23',
'updated' => '2007-03-18 10:43:31'
'updated' => '2007-03-18 10:43:31',
'afterFind' => 'Successfuly added by AfterFind'
),
'Something' => array(
array(
Expand All @@ -1749,7 +1752,8 @@ public function testWithAssociation() {
'something_else_id' => '2',
'doomed' => true,
'created' => '2007-03-18 10:39:23',
'updated' => '2007-03-18 10:41:31'
'updated' => '2007-03-18 10:41:31',
'afterFind' => 'Successfuly added by AfterFind'
)))),
array(
'SomethingElse' => array(
Expand All @@ -1758,7 +1762,8 @@ public function testWithAssociation() {
'body' => 'Third Post Body',
'published' => 'Y',
'created' => '2007-03-18 10:43:23',
'updated' => '2007-03-18 10:45:31'
'updated' => '2007-03-18 10:45:31',
'afterFind' => 'Successfuly added by AfterFind'
),
'Something' => array(
array(
Expand All @@ -1774,7 +1779,8 @@ public function testWithAssociation() {
'something_else_id' => '3',
'doomed' => false,
'created' => '2007-03-18 10:41:23',
'updated' => '2007-03-18 10:43:31'
'updated' => '2007-03-18 10:43:31',
'afterFind' => 'Successfuly added by AfterFind'
)))));
$this->assertEquals($expected, $result);

Expand All @@ -1800,8 +1806,11 @@ public function testWithAssociation() {
'JoinThing' => array(
'doomed' => true,
'something_id' => '1',
'something_else_id' => '2'
)))),
'something_else_id' => '2',
'afterFind' => 'Successfuly added by AfterFind'
),
'afterFind' => 'Successfuly added by AfterFind'
))),
array(
'Something' => array(
'id' => '2',
Expand All @@ -1822,8 +1831,11 @@ public function testWithAssociation() {
'JoinThing' => array(
'doomed' => false,
'something_id' => '2',
'something_else_id' => '3'
)))),
'something_else_id' => '3',
'afterFind' => 'Successfuly added by AfterFind'
),
'afterFind' => 'Successfuly added by AfterFind'
))),
array(
'Something' => array(
'id' => '3',
Expand All @@ -1844,8 +1856,11 @@ public function testWithAssociation() {
'JoinThing' => array(
'doomed' => true,
'something_id' => '3',
'something_else_id' => '1'
)))));
'something_else_id' => '1',
'afterFind' => 'Successfuly added by AfterFind'
),
'afterFind' => 'Successfuly added by AfterFind'
))));
$this->assertEquals($expected, $result);

$result = $TestModel->findById(1);
Expand All @@ -1869,8 +1884,11 @@ public function testWithAssociation() {
'JoinThing' => array(
'doomed' => true,
'something_id' => '1',
'something_else_id' => '2'
))));
'something_else_id' => '2',
'afterFind' => 'Successfuly added by AfterFind'
),
'afterFind' => 'Successfuly added by AfterFind'
)));
$this->assertEquals($expected, $result);

$expected = $TestModel->findById(1);
Expand Down Expand Up @@ -1910,8 +1928,10 @@ public function testWithAssociation() {
'JoinThing' => array(
'doomed' => true,
'something_id' => '1',
'something_else_id' => '1'
)
'something_else_id' => '1',
'afterFind' => 'Successfuly added by AfterFind'
),
'afterFind' => 'Successfuly added by AfterFind'
),
array(
'id' => '2',
Expand All @@ -1923,8 +1943,10 @@ public function testWithAssociation() {
'JoinThing' => array(
'doomed' => true,
'something_id' => '1',
'something_else_id' => '2'
)
'something_else_id' => '2',
'afterFind' => 'Successfuly added by AfterFind'
),
'afterFind' => 'Successfuly added by AfterFind'
),
array(
'id' => '3',
Expand All @@ -1936,10 +1958,12 @@ public function testWithAssociation() {
'JoinThing' => array(
'doomed' => false,
'something_id' => '1',
'something_else_id' => '3')
)
'something_else_id' => '3',
'afterFind' => 'Successfuly added by AfterFind'
),
'afterFind' => 'Successfuly added by AfterFind'
)
);
));
$this->assertEquals(self::date(), $result['Something']['updated']);
unset($result['Something']['updated']);
$this->assertEquals($expected, $result);
Expand Down

0 comments on commit d7dab32

Please sign in to comment.