adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-18 18:46:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Re-inserting the expected array for clarity in testSaveAllValidation

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6813 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
mariano.iglesias 2008-05-11 23:30:41 +00:00
parent 47dad34bb6
commit ccd28c0139
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
cake/tests/cases/libs/model/model.test.php
View file

@ -2219,8 +2219,6 @@ class ModelTest extends CakeTestCase {
$this->loadFixtures('Post', 'Author', 'Comment', 'Attachment'); $this->loadFixtures('Post', 'Author', 'Comment', 'Attachment');
$this->model =& new Post(); $this->model =& new Post();
$result = $this->model->find('all', array('recursive' => -1));
$data = array( $data = array(
array('id' => '1', 'title' => 'Baleeted First Post', 'body' => 'Baleeted!', 'published' => 'N'), array('id' => '1', 'title' => 'Baleeted First Post', 'body' => 'Baleeted!', 'published' => 'N'),
array('id' => '2', 'title' => 'Just update the title'), array('id' => '2', 'title' => 'Just update the title'),
@ -2260,11 +2258,16 @@ class ModelTest extends CakeTestCase {
array('id' => '1', 'title' => 'Un-Baleeted First Post', 'body' => 'Not Baleeted!', 'published' => 'Y'), array('id' => '1', 'title' => 'Un-Baleeted First Post', 'body' => 'Not Baleeted!', 'published' => 'Y'),
array('id' => '2', 'title' => '', 'body' => 'Trying to get away with an empty title'), array('id' => '2', 'title' => '', 'body' => 'Trying to get away with an empty title'),
); );
$ts = date('Y-m-d H:i:s');
$result = $this->model->saveAll($data, array('atomic' => false)); $result = $this->model->saveAll($data, array('atomic' => false));
$this->assertEqual($result, array(true, false)); $this->assertEqual($result, array(true, false));
$newTs = date('Y-m-d H:i:s');
$expected[0]['Post'] = array_merge($expected[0]['Post'], $data[0], array('updated' => $ts)); $expected = array(
array('Post' => array('id' => '1', 'author_id' => '1', 'title' => 'Baleeted First Post', 'body' => 'Baleeted!', 'published' => 'N', 'created' => '2007-03-18 10:39:23', 'updated' => $ts)),
array('Post' => array('id' => '2', 'author_id' => '3', 'title' => 'Just update the title', 'body' => 'Second Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => $ts)),
array('Post' => array('id' => '3', 'author_id' => '1', 'title' => 'Third Post', 'body' => 'Third Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31')),
array('Post' => array('id' => '4', 'author_id' => '2', 'title' => 'Creating a fourth post', 'body' => 'Fourth post body', 'published' => 'N', 'created' => $ts, 'updated' => $ts))
);
$expected[0]['Post'] = array_merge($expected[0]['Post'], $data[0], array('updated' => $newTs));
$result = $this->model->find('all', array('recursive' => -1)); $result = $this->model->find('all', array('recursive' => -1));
$errors = array(2 => array('title' => 'This field cannot be left blank')); $errors = array(2 => array('title' => 'This field cannot be left blank'));
$this->assertEqual($result, $expected); $this->assertEqual($result, $expected);