summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--modules/node/node.install2
-rw-r--r--modules/simpletest/tests/upgrade/upgrade.node.test5
2 files changed, 7 insertions, 0 deletions
diff --git a/modules/node/node.install b/modules/node/node.install
index 852c1117b..a08e99757 100644
--- a/modules/node/node.install
+++ b/modules/node/node.install
@@ -628,6 +628,8 @@ function node_update_7006(&$sandbox) {
'entity_type' => 'node',
'bundle' => $node_type->type,
'label' => $node_type->body_label,
+ 'description' => isset($node_type->description) ? $node_type->description : '',
+ 'required' => (isset($node_type->min_word_count) && $node_type->min_word_count > 0) ? 1 : 0,
'widget' => array(
'type' => 'text_textarea_with_summary',
'settings' => array(
diff --git a/modules/simpletest/tests/upgrade/upgrade.node.test b/modules/simpletest/tests/upgrade/upgrade.node.test
index 163dbef5e..cd44790c7 100644
--- a/modules/simpletest/tests/upgrade/upgrade.node.test
+++ b/modules/simpletest/tests/upgrade/upgrade.node.test
@@ -27,6 +27,11 @@ class NodeBodyUpgradePathTestCase extends UpgradePathTestCase {
*/
public function testNodeBodyUpgrade() {
$this->assertTrue($this->performUpgrade(), t('The upgrade was completed successfully.'));
+
+ $instance = field_info_instance('node', 'body', 'story');
+ $this->assertIdentical($instance['required'], 0, 'The required setting was preserved during the upgrade path.');
+ $this->assertTrue($instance['description'], 'The description was preserved during the upgrade path');
+
$this->drupalGet("content/1263769200");
$this->assertText('node body (broken) - 37');