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

#312792 by catch: Clean-up for editForumTaxonomy().

merge-requests/26/head
Angie Byron 2008-10-12 01:01:44 +00:00
parent 430d839569
commit 72bbd21e5c
1 changed files with 9 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
modules/forum/forum.test
View File

@ -113,14 +113,11 @@ class ForumTestCase extends DrupalWebTestCase {
/** /**
* Edit the forum taxonomy. * Edit the forum taxonomy.
*
*/ */
function editForumTaxonomy() { function editForumTaxonomy() {
// Backup forum taxonomy. // Backup forum taxonomy.
$vid = variable_get('forum_nav_vocabulary', ''); $vid = variable_get('forum_nav_vocabulary', '');
// This function returns NULL (the cache value is false). $original_settings = taxonomy_vocabulary_load($vid);
// $original_settings = taxonomy_vocabulary_load($vid);
$original_settings = db_fetch_array(db_query('SELECT v.* FROM {vocabulary} v WHERE v.vid = %d', $vid));
// Generate a random name/description. // Generate a random name/description.
$title = $this->randomName(10); $title = $this->randomName(10);
@ -134,41 +131,22 @@ class ForumTestCase extends DrupalWebTestCase {
); );
// Edit the vocabulary. // Edit the vocabulary.
$this->drupalPost('admin/content/taxonomy/' . $vid . '/edit', $edit, t('Save')); $this->drupalPost('admin/content/taxonomy/' . $vid, $edit, t('Save'));
$this->assertResponse(200); $this->assertResponse(200);
$this->assertRaw(t('Updated vocabulary %name.', array('%name' => $title)), t('Vocabulary was edited')); $this->assertRaw(t('Updated vocabulary %name.', array('%name' => $title)), t('Vocabulary was edited'));
// Grab the newly edited vocabulary. // Grab the newly edited vocabulary.
$cur_settings = db_fetch_array(db_query('SELECT v.* FROM {vocabulary} v WHERE v.vid = %d', $vid)); $current_settings = taxonomy_vocabulary_load($vid, TRUE);
// Make sure we actually edited the vocabulary properly. // Make sure we actually edited the vocabulary properly.
$this->assertTrue($cur_settings['name'] == $title, 'The name was updated'); $this->assertEqual($current_settings->name, $title, t('The name was updated'));
$this->assertTrue($cur_settings['description'] == $description, 'The description was updated'); $this->assertEqual($current_settings->description, $description, t('The description was updated'));
// Restore the name/description. // Restore the original vocabulary.
$title = $original_settings['name'];
$description = $original_settings['description'];
$description = ($description == NULL) ? '' : $description;
$edit = array(
'name' => $title,
'description' => $description,
'help' => '',
'weight' => -10
);
// Edit the vocabulary.
$this->drupalPost('admin/content/taxonomy/' . $vid . 'edit', $edit, t('Save'));
$this->assertResponse(200);
$this->assertRaw(t('Updated vocabulary %name.', array('%name' => $title)), t('Vocabulary was edited'));
/*
// Verify original forum taxonomy.
$original_settings = (array) $original_settings; $original_settings = (array) $original_settings;
taxonomy_save_vocabulary($original_settings); // This fails because taxonomy_vocabulary_load returns NULL. taxonomy_save_vocabulary($original_settings);
$cur_settings = db_fetch_array(db_query('SELECT v.* FROM {vocabulary} v WHERE v.vid = %d', $vid)); $current_settings = taxonomy_vocabulary_load($vid, TRUE);
$this->assertTrue($cur_settings['name'] == $original_settings['name'], 'The name was restored'); $this->assertEqual($current_settings->name, $original_settings['name'], 'The original vocabulary settings were restored');
$this->assertTrue(!isset($cur_settings['description']), 'The description was restored');
*/
} }
/** /**