diff --git a/core/modules/forum/lib/Drupal/forum/Tests/ForumTest.php b/core/modules/forum/lib/Drupal/forum/Tests/ForumTest.php
index f56cfbb..e6bab38 100644
--- a/core/modules/forum/lib/Drupal/forum/Tests/ForumTest.php
+++ b/core/modules/forum/lib/Drupal/forum/Tests/ForumTest.php
@@ -325,13 +325,11 @@ function editForumTaxonomy() {
$vid = config('forum.settings')->get('vocabulary');
$original_settings = taxonomy_vocabulary_load($vid);
- // Generate a random name/description.
+ // Generate a random name.
$title = $this->randomName(10);
- $description = $this->randomName(100);
$edit = array(
'name' => $title,
- 'description' => $description,
'machine_name' => drupal_strtolower(drupal_substr($this->randomName(), 3, 9)),
);
@@ -346,7 +344,6 @@ function editForumTaxonomy() {
// Make sure we actually edited the vocabulary properly.
$this->assertEqual($current_settings->name, $title, 'The name was updated');
- $this->assertEqual($current_settings->description, $description, 'The description was updated');
// Restore the original vocabulary.
taxonomy_vocabulary_save($original_settings);
@@ -367,13 +364,11 @@ function editForumTaxonomy() {
* The created taxonomy term data.
*/
function createForum($type, $parent = 0) {
- // Generate a random name/description.
+ // Generate a random name.
$name = $this->randomName(10);
- $description = $this->randomName(100);
$edit = array(
'name' => $name,
- 'description' => $description,
'parent[0]' => $parent,
'weight' => '0',
);
@@ -391,7 +386,7 @@ function createForum($type, $parent = 0) {
);
// Verify forum.
- $term = db_query("SELECT * FROM {taxonomy_term_data} t WHERE t.vid = :vid AND t.name = :name AND t.description = :desc", array(':vid' => config('forum.settings')->get('vocabulary'), ':name' => $name, ':desc' => $description))->fetchAssoc();
+ $term = db_query("SELECT * FROM {taxonomy_term_data} t WHERE t.vid = :vid AND t.name = :name", array(':vid' => config('forum.settings')->get('vocabulary'), ':name' => $name))->fetchAssoc();
$this->assertTrue(!empty($term), 'The ' . $type . ' exists in the database');
// Verify forum hierarchy.
diff --git a/core/modules/forum/templates/forum-list.tpl.php b/core/modules/forum/templates/forum-list.tpl.php
index b169493..5242c8f 100644
--- a/core/modules/forum/templates/forum-list.tpl.php
+++ b/core/modules/forum/templates/forum-list.tpl.php
@@ -16,7 +16,6 @@
* - $forum->icon_title: Text alternative for the forum icon.
* - $forum->name: The name of the forum.
* - $forum->link: The URL to link to this forum.
- * - $forum->description: The description of this forum.
* - $forum->new_topics: TRUE if the forum contains unread posts.
* - $forum->new_url: A URL to the forum's unread posts.
* - $forum->new_text: Text for the above URL, which tells how many new posts.
@@ -55,9 +54,6 @@
icon_title; ?>
- description): ?>
- description; ?>
-
', $forum->depth); ?>
is_container): ?>
diff --git a/core/modules/path/lib/Drupal/path/Tests/PathTaxonomyTermTest.php b/core/modules/path/lib/Drupal/path/Tests/PathTaxonomyTermTest.php
index 421870d..732f324 100644
--- a/core/modules/path/lib/Drupal/path/Tests/PathTaxonomyTermTest.php
+++ b/core/modules/path/lib/Drupal/path/Tests/PathTaxonomyTermTest.php
@@ -50,14 +50,14 @@ function testTermAlias() {
$vocabulary = taxonomy_vocabulary_load(1);
$description = $this->randomName();;
$edit = array();
- $edit['name'] = $this->randomName();
- $edit['description[value]'] = $description;
+ $name = $this->randomName();
+ $edit['name'] = $name;
$edit['path[alias]'] = $this->randomName();
$this->drupalPost('admin/structure/taxonomy/' . $vocabulary->machine_name . '/add', $edit, t('Save'));
// Confirm that the alias works.
$this->drupalGet($edit['path[alias]']);
- $this->assertText($description, 'Term can be accessed on URL alias.');
+ $this->assertText($name, 'Term can be accessed on URL alias.');
// Change the term's URL alias.
$tid = db_query("SELECT tid FROM {taxonomy_term_data} WHERE name = :name", array(':name' => $edit['name']))->fetchField();
@@ -67,11 +67,11 @@ function testTermAlias() {
// Confirm that the changed alias works.
$this->drupalGet($edit2['path[alias]']);
- $this->assertText($description, 'Term can be accessed on changed URL alias.');
+ $this->assertText($name, 'Term can be accessed on changed URL alias.');
// Confirm that the old alias no longer works.
$this->drupalGet($edit['path[alias]']);
- $this->assertNoText($description, 'Old URL alias has been removed after altering.');
+ $this->assertNoText($name, 'Old URL alias has been removed after altering.');
$this->assertResponse(404, 'Old URL alias returns 404.');
// Remove the term's URL alias.
@@ -81,7 +81,7 @@ function testTermAlias() {
// Confirm that the alias no longer works.
$this->drupalGet($edit2['path[alias]']);
- $this->assertNoText($description, 'Old URL alias has been removed after altering.');
+ $this->assertNoText($name, 'Old URL alias has been removed after altering.');
$this->assertResponse(404, 'Old URL alias returns 404.');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/TaxonomyUpgradePathTest.php b/core/modules/system/lib/Drupal/system/Tests/Upgrade/TaxonomyUpgradePathTest.php
new file mode 100644
index 0000000..4308ee9
--- /dev/null
+++ b/core/modules/system/lib/Drupal/system/Tests/Upgrade/TaxonomyUpgradePathTest.php
@@ -0,0 +1,64 @@
+ 'Taxonomy upgrade test',
+ 'description' => 'Upgrade tests for a Taxonomy Term data.',
+ 'group' => 'Upgrade path',
+ );
+ }
+
+ public function setUp() {
+ // Path to the database dump files.
+ $this->databaseDumpFiles = array(
+ drupal_get_path('module', 'system') . '/tests/upgrade/drupal-7.filled.standard_all.database.php.gz',
+ );
+ parent::setUp();
+ }
+
+ /**
+ * Tests a successful point release update.
+ */
+ public function testTaxonomyUpgrade() {
+ $this->assertTrue($this->performUpgrade(), 'The upgrade was completed successfully.');
+ // Check if the field was created.
+ $field_info = field_info_field('taxonomy_term_description');
+ $this->assertNotNull(field_info_field('taxonomy_term_description'), 'Field {taxonomy_term_description} was created');
+ $select = db_select('taxonomy_term_data', 'ttd')
+ ->fields('ttd', array('tid'))
+ ->condition('ttd.tid', 1, '>')
+ ->orderBy('ttd.tid', 'ASC');
+ $tids = $select->execute()->fetchCol();
+ $taxonomy_terms = taxonomy_term_load_multiple($tids);
+ foreach ($taxonomy_terms as $taxonomy_term) {
+ if (empty($taxonomy_term)) {
+ $this->assert(FALSE, "Taxonomy term $tid not found.");
+ }
+ else {
+ $description = field_get_items('taxonomy_term', $taxonomy_term, 'taxonomy_term_description');
+ if (empty($description)) {
+ $this->assert(FALSE, "Description found for taxonomy term {$taxonomy_term->tid}.");
+ }
+ else {
+ $this->assert(TRUE, "Description found for taxonomy term {$taxonomy_term->tid}.");
+ }
+ }
+ }
+ }
+}
diff --git a/core/modules/system/tests/upgrade/drupal-7.filled.standard_all.database.php.gz b/core/modules/system/tests/upgrade/drupal-7.filled.standard_all.database.php.gz
index 05f47a4..5343fa0 100644
--- a/core/modules/system/tests/upgrade/drupal-7.filled.standard_all.database.php.gz
+++ b/core/modules/system/tests/upgrade/drupal-7.filled.standard_all.database.php.gz
@@ -1,4 +1,4 @@
-NKP drupal-7.filled.standard_all.database.php {o67~
+P drupal-7.filled.standard_all.database.php {o67~
bowكd7$ r֎ZHj{/PEԅ"fxlX_Ūb/awӟ.<~x[
7Љo
(vR/I1>D| g_伸^eNq8ߺ&Cs(
h!|a^t8ЛOo0فQD/}=^s!6ݧ{r(.+_(o&Aݐyӣd[7=Dn&{}ɫϠ R/ٯ|:gfxFۼ4<7F/]I׳kMwxxn&(N7Ǽ{?D]^$ɿ&Ё?Ro0xps|(0cR8N[܋?ixh
D xn6^{Ʊşbi-Aoe4}=x5a߾5_%
{p}>;T94}lGu_O4:Z?~ 7ʇq ;$
}1,!cOL
u(xs:AOc|>?,d
Kb*į'9-aK~ՉG8᱄SeR&X9zWyDB͂ŲxW9/bNhb24g7P4Ժppc"I L=4h1oTT>x]%gEDAr$@i /QE)G0%Cx7tg78zסdp| n@|lUnj yGrKv0]-}_Ʈ~O3` } ОQMs zKoy7'`UMկu
@@ -328,74 +328,91 @@ qCL
%Wʗ'Ź]bďֈelzmw7-cSklhFB_ޛdB}E\6M+d&R'Zjq*ynΫ!'Lذv%my&~e 6s6y~E T
gEI3:5`7d L\^V~l].^ ]bA*ZmQiq_gk
L?ux`Ir6*+{0iOz|w=귟GJZf1":uJ>`u`ߞ˳hN,T
lUhnh-y74M=c?k߿SlA
pϻ8);rDBڭ-f,*!J_ӏXsFAFru K[g{hf0_X/j3[}>vpͦ)g ZbHF*퇩_>|,Ԍk6Vsfp9~$\Ct9/ˬ". ?mT>r`|o ܜK(0#ARddxNj}Es$Ӷ5o8ѭ=rف0wzs~z9R^:5:NP`DF02RU)vN/DzCu_7[jS6cp
XRܿi76M~!Zl@LQq R@'`/*.6;$hFvll+PAjp<ծ18 U{?
>%V4V$
-YIQr mX
h?P\}f`tl:|gЇ]th`U,ecD6uzmcSQ]&2#.?ocz˩{_䶍,[nlHuL]ǎLLe&RnƒR/3~@
- EZnw$8 zA m?9`hbCn灉-
1ÈGVj]זIHP =&ՂF|tȌ:6RdZ!+kHRЊp1q1p4fp3#csp/ۀ
E&3b8--LA'kږe/,1[aqK-XVg^%Ѱp4`!9'Kӷ|OsX,^-zhf.`tFs2@ c8gH7B|a@ @/xK`-cBS =>1J0kmxm3pS 8(21JWm' (F@CLܽngc3
-,s43b`a(RgBtGC?0B:!F-YBQ`;Vwl0o[s{bt(.7"Z.ҏ1koX..:7
-bxXԃuQFq 8}kθkwe8A1H
p1bt`<0@ q~Iɮbsq]A`p`o8f3o8`=`c3IB#wx:^7Ƙ;Vm
-^hXp]qwdcG..q)7McEy@rLqE $64 l%EўS`oM0n Kpb
-a0@3^ %疠@L&U`ԪqߴiYK0\ L`]3<<