2 files changed, 14 insertions, 3 deletions
diff --git a/modules/system/system.install b/modules/system/system.install
index af694203e..1c787f13f 100644
--- a/modules/system/system.install
+++ b/modules/system/system.install
@@ -3549,6 +3549,17 @@ function system_update_7026() {
 }
 
 /**
+ * Enable field type modules.
+ */
+function system_update_7027() {
+  $ret = array();
+  $module_list = array('text', 'number', 'list', 'options');
+  drupal_install_modules($module_list);
+  module_enable($module_list);
+  return $ret;
+}
+
+/**
  * @} End of "defgroup updates-6.x-to-7.x"
  * The next series of updates should start at 8000.
  */
diff --git a/modules/system/system.test b/modules/system/system.test
index 533a3cdc8..46cafc001 100644
--- a/modules/system/system.test
+++ b/modules/system/system.test
@@ -518,7 +518,7 @@ class AccessDeniedTestCase extends DrupalWebTestCase {
 
     $edit = array(
       'title' => $this->randomName(10),
-      'body' => $this->randomName(100)
+      'body' => array(array('value' => $this->randomName(100))),
     );
     $node = $this->drupalCreateNode($edit);
 
@@ -579,7 +579,7 @@ class PageNotFoundTestCase extends DrupalWebTestCase {
 
     $edit = array(
       'title' => $this->randomName(10),
-      'body' => $this->randomName(100)
+      'body' => array(array('value' => $this->randomName(100))),
     );
     $node = $this->drupalCreateNode($edit);
 
@@ -705,7 +705,7 @@ class PageTitleFiltering extends DrupalWebTestCase {
     // Generate node content.
     $edit = array(
      'title' => '!SimpleTest! ' . $title . $this->randomName(20),
-     'body' => '!SimpleTest! test body' . $this->randomName(200),
+     'body[0][value]' => '!SimpleTest! test body' . $this->randomName(200),
     );
     // Create the node with HTML in the title.
     $this->drupalPost('node/add/page', $edit, t('Save'));