Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Fixed a merge problem.

merge-requests/26/head
Dries Buytaert 2009-06-13 21:08:31 +00:00
parent bc50341c5c
commit 07b6c7bcd8
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/system/system.test
View File

@ -579,11 +579,7 @@ class PageNotFoundTestCase extends DrupalWebTestCase {
$edit = array( $edit = array(
'title' => $this->randomName(10), 'title' => $this->randomName(10),
<<<<<<< system.test
NODE_BODY_FIELD => array(array('value' => $this->randomName(100))),
=======
'body' => array(array('value' => $this->randomName(100))), 'body' => array(array('value' => $this->randomName(100))),
>>>>>>> 1.47
); );
$node = $this->drupalCreateNode($edit); $node = $this->drupalCreateNode($edit);
@ -709,11 +705,7 @@ class PageTitleFiltering extends DrupalWebTestCase {
// Generate node content. // Generate node content.
$edit = array( $edit = array(
'title' => '!SimpleTest! ' . $title . $this->randomName(20), 'title' => '!SimpleTest! ' . $title . $this->randomName(20),
<<<<<<< system.test
NODE_BODY_FIELD . '[0][value]' => '!SimpleTest! test body' . $this->randomName(200),
=======
'body[0][value]' => '!SimpleTest! test body' . $this->randomName(200), 'body[0][value]' => '!SimpleTest! test body' . $this->randomName(200),
>>>>>>> 1.47
); );
// Create the node with HTML in the title. // Create the node with HTML in the title.
$this->drupalPost('node/add/page', $edit, t('Save')); $this->drupalPost('node/add/page', $edit, t('Save'));