- Patch #391412 by JamesAn et al: move contact form, post, and user settings below Site configuration.

1 files changed, 13 insertions, 1 deletions

diff --git a/modules/system/system.test b/modules/system/system.test
index 46cafc001..17c76a65a 100644
--- a/modules/system/system.test
+++ b/modules/system/system.test
@@ -454,8 +454,8 @@ class AdminOverviewTestCase extends DrupalWebTestCase {
     $this->assertLink(t('Content management'));
 
     // Make sure menu items without children are hidden.
-    $this->assertNoLink(t('Site building'));
     $this->assertNoLink(t('Site configuration'));
+    $this->assertNoLink(t('Site building'));
     $this->assertNoLink(t('User management'));
     $this->assertNoLink(t('Reports'));
   }
@@ -518,7 +518,11 @@ class AccessDeniedTestCase extends DrupalWebTestCase {
 
     $edit = array(
       'title' => $this->randomName(10),
+<<<<<<< system.test
+      NODE_BODY_FIELD => array(array('value' => $this->randomName(100))),
+=======
       'body' => array(array('value' => $this->randomName(100))),
+>>>>>>> 1.47
     );
     $node = $this->drupalCreateNode($edit);
 
@@ -579,7 +583,11 @@ class PageNotFoundTestCase extends DrupalWebTestCase {
 
     $edit = array(
       'title' => $this->randomName(10),
+<<<<<<< system.test
+      NODE_BODY_FIELD => array(array('value' => $this->randomName(100))),
+=======
       'body' => array(array('value' => $this->randomName(100))),
+>>>>>>> 1.47
     );
     $node = $this->drupalCreateNode($edit);
 
@@ -705,7 +713,11 @@ class PageTitleFiltering extends DrupalWebTestCase {
     // Generate node content.
     $edit = array(
      '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),
+>>>>>>> 1.47
     );
     // Create the node with HTML in the title.
     $this->drupalPost('node/add/page', $edit, t('Save'));