Skip to content

Commit d7dab32

Browse files
k-halaburdak-halaburda
committed
Remove added fixtures and use existing. Updated one old test to add data from afterFind callback
1 parent bb7ff48 commit d7dab32

File tree

7 files changed

+272
-358
lines changed

7 files changed

+272
-358
lines changed

‎lib/Cake/Test/Case/Model/ModelIntegrationTest.php

Lines changed: 45 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1708,7 +1708,8 @@ public function testWithAssociation() {
17081708
'body' => 'First Post Body',
17091709
'published' => 'Y',
17101710
'created' => '2007-03-18 10:39:23',
1711-
'updated' => '2007-03-18 10:41:31'
1711+
'updated' => '2007-03-18 10:41:31',
1712+
'afterFind' => 'Successfuly added by AfterFind'
17121713
),
17131714
'Something' => array(
17141715
array(
@@ -1724,7 +1725,8 @@ public function testWithAssociation() {
17241725
'something_else_id' => '1',
17251726
'doomed' => true,
17261727
'created' => '2007-03-18 10:43:23',
1727-
'updated' => '2007-03-18 10:45:31'
1728+
'updated' => '2007-03-18 10:45:31',
1729+
'afterFind' => 'Successfuly added by AfterFind'
17281730
)))),
17291731
array(
17301732
'SomethingElse' => array(
@@ -1733,7 +1735,8 @@ public function testWithAssociation() {
17331735
'body' => 'Second Post Body',
17341736
'published' => 'Y',
17351737
'created' => '2007-03-18 10:41:23',
1736-
'updated' => '2007-03-18 10:43:31'
1738+
'updated' => '2007-03-18 10:43:31',
1739+
'afterFind' => 'Successfuly added by AfterFind'
17371740
),
17381741
'Something' => array(
17391742
array(
@@ -1749,7 +1752,8 @@ public function testWithAssociation() {
17491752
'something_else_id' => '2',
17501753
'doomed' => true,
17511754
'created' => '2007-03-18 10:39:23',
1752-
'updated' => '2007-03-18 10:41:31'
1755+
'updated' => '2007-03-18 10:41:31',
1756+
'afterFind' => 'Successfuly added by AfterFind'
17531757
)))),
17541758
array(
17551759
'SomethingElse' => array(
@@ -1758,7 +1762,8 @@ public function testWithAssociation() {
17581762
'body' => 'Third Post Body',
17591763
'published' => 'Y',
17601764
'created' => '2007-03-18 10:43:23',
1761-
'updated' => '2007-03-18 10:45:31'
1765+
'updated' => '2007-03-18 10:45:31',
1766+
'afterFind' => 'Successfuly added by AfterFind'
17621767
),
17631768
'Something' => array(
17641769
array(
@@ -1774,7 +1779,8 @@ public function testWithAssociation() {
17741779
'something_else_id' => '3',
17751780
'doomed' => false,
17761781
'created' => '2007-03-18 10:41:23',
1777-
'updated' => '2007-03-18 10:43:31'
1782+
'updated' => '2007-03-18 10:43:31',
1783+
'afterFind' => 'Successfuly added by AfterFind'
17781784
)))));
17791785
$this->assertEquals($expected, $result);
17801786

@@ -1800,8 +1806,11 @@ public function testWithAssociation() {
18001806
'JoinThing' => array(
18011807
'doomed' => true,
18021808
'something_id' => '1',
1803-
'something_else_id' => '2'
1804-
)))),
1809+
'something_else_id' => '2',
1810+
'afterFind' => 'Successfuly added by AfterFind'
1811+
),
1812+
'afterFind' => 'Successfuly added by AfterFind'
1813+
))),
18051814
array(
18061815
'Something' => array(
18071816
'id' => '2',
@@ -1822,8 +1831,11 @@ public function testWithAssociation() {
18221831
'JoinThing' => array(
18231832
'doomed' => false,
18241833
'something_id' => '2',
1825-
'something_else_id' => '3'
1826-
)))),
1834+
'something_else_id' => '3',
1835+
'afterFind' => 'Successfuly added by AfterFind'
1836+
),
1837+
'afterFind' => 'Successfuly added by AfterFind'
1838+
))),
18271839
array(
18281840
'Something' => array(
18291841
'id' => '3',
@@ -1844,8 +1856,11 @@ public function testWithAssociation() {
18441856
'JoinThing' => array(
18451857
'doomed' => true,
18461858
'something_id' => '3',
1847-
'something_else_id' => '1'
1848-
)))));
1859+
'something_else_id' => '1',
1860+
'afterFind' => 'Successfuly added by AfterFind'
1861+
),
1862+
'afterFind' => 'Successfuly added by AfterFind'
1863+
))));
18491864
$this->assertEquals($expected, $result);
18501865

18511866
$result = $TestModel->findById(1);
@@ -1869,8 +1884,11 @@ public function testWithAssociation() {
18691884
'JoinThing' => array(
18701885
'doomed' => true,
18711886
'something_id' => '1',
1872-
'something_else_id' => '2'
1873-
))));
1887+
'something_else_id' => '2',
1888+
'afterFind' => 'Successfuly added by AfterFind'
1889+
),
1890+
'afterFind' => 'Successfuly added by AfterFind'
1891+
)));
18741892
$this->assertEquals($expected, $result);
18751893

18761894
$expected = $TestModel->findById(1);
@@ -1910,8 +1928,10 @@ public function testWithAssociation() {
19101928
'JoinThing' => array(
19111929
'doomed' => true,
19121930
'something_id' => '1',
1913-
'something_else_id' => '1'
1914-
)
1931+
'something_else_id' => '1',
1932+
'afterFind' => 'Successfuly added by AfterFind'
1933+
),
1934+
'afterFind' => 'Successfuly added by AfterFind'
19151935
),
19161936
array(
19171937
'id' => '2',
@@ -1923,8 +1943,10 @@ public function testWithAssociation() {
19231943
'JoinThing' => array(
19241944
'doomed' => true,
19251945
'something_id' => '1',
1926-
'something_else_id' => '2'
1927-
)
1946+
'something_else_id' => '2',
1947+
'afterFind' => 'Successfuly added by AfterFind'
1948+
),
1949+
'afterFind' => 'Successfuly added by AfterFind'
19281950
),
19291951
array(
19301952
'id' => '3',
@@ -1936,10 +1958,12 @@ public function testWithAssociation() {
19361958
'JoinThing' => array(
19371959
'doomed' => false,
19381960
'something_id' => '1',
1939-
'something_else_id' => '3')
1940-
)
1961+
'something_else_id' => '3',
1962+
'afterFind' => 'Successfuly added by AfterFind'
1963+
),
1964+
'afterFind' => 'Successfuly added by AfterFind'
19411965
)
1942-
);
1966+
));
19431967
$this->assertEquals(self::date(), $result['Something']['updated']);
19441968
unset($result['Something']['updated']);
19451969
$this->assertEquals($expected, $result);

0 commit comments

Comments
 (0)