Commit 2356ba1c authored by Nicholas Thompson's avatar Nicholas Thompson
Browse files

Updating the SimpleTest inline with #1169424 and fixing a typo found by the...

Updating the SimpleTest inline with #1169424 and fixing a typo found by the updated Simpltest. Thank you Simpletest.
parent 93e51319
...@@ -34,7 +34,7 @@ function forum_page_title_pattern_alter(&$pattern, &$types) { ...@@ -34,7 +34,7 @@ function forum_page_title_pattern_alter(&$pattern, &$types) {
$types['term'] = $forum; $types['term'] = $forum;
$forum_vid = variable_get('forum_nav_vocabulary', ''); $forum_vid = variable_get('forum_nav_vocabulary', '');
$form_vocab = taxonomy_vocabulary_load($forum_vid); $forum_vocab = taxonomy_vocabulary_load($forum_vid);
$pattern = variable_get('page_title_vocab_' . $forum_vocab->machine_name, ''); $pattern = variable_get('page_title_vocab_' . $forum_vocab->machine_name, '');
$types['vocabulary'] = $forum_vocab; $types['vocabulary'] = $forum_vocab;
......
...@@ -80,10 +80,10 @@ class PageTitleTestCase extends DrupalWebTestCase { ...@@ -80,10 +80,10 @@ class PageTitleTestCase extends DrupalWebTestCase {
'page_title_type_page_showfield' => 1, 'page_title_type_page_showfield' => 1,
'page_title_type_forum' => 'Forum - [current-page:page-title]', 'page_title_type_forum' => 'Forum - [current-page:page-title]',
'page_title_pager_pattern' => ' - page [current-page:page-number]', 'page_title_pager_pattern' => ' - page [current-page:page-number]',
'page_title_vocab_1' => 'FORUM: [term:name]', 'page_title_vocab_forums' => 'FORUM: [term:name]',
'page_title_vocab_2' => 'TERM: [current-page:page-title]', 'page_title_vocab_tags' => 'TERM: [current-page:page-title]',
'page_title_vocab_1_showfield' => 1, 'page_title_vocab_forums_showfield' => 1,
'page_title_vocab_2_showfield' => 1, 'page_title_vocab_tags_showfield' => 1,
'page_title_forum_root_title' => 'Welcome to [site:name] [current-page:page-title]', 'page_title_forum_root_title' => 'Welcome to [site:name] [current-page:page-title]',
); );
...@@ -145,7 +145,7 @@ class PageTitleTestCase extends DrupalWebTestCase { ...@@ -145,7 +145,7 @@ class PageTitleTestCase extends DrupalWebTestCase {
// Lets check a taxonomy/term/tid page (should be term from earlier!) // Lets check a taxonomy/term/tid page (should be term from earlier!)
// Load the term page and check for the title in the head // Load the term page and check for the title in the head
$this->pageTitleCheck('taxonomy/term/2', $settings['page_title_vocab_2'], array('[current-page:page-title]' => $term['name']), 'Taxonomy Title'); $this->pageTitleCheck('taxonomy/term/2', $settings['page_title_vocab_tags'], array('[current-page:page-title]' => $term['name']), 'Taxonomy Title');
...@@ -154,7 +154,7 @@ class PageTitleTestCase extends DrupalWebTestCase { ...@@ -154,7 +154,7 @@ class PageTitleTestCase extends DrupalWebTestCase {
// Remember, the page value in the URL is zero indexed. This means page=1 in URL is Page 2 on the site // Remember, the page value in the URL is zero indexed. This means page=1 in URL is Page 2 on the site
$this->pageTitleCheck( $this->pageTitleCheck(
array('path' => 'taxonomy/term/2', 'options' => array('query' => array('page' => 1))), array('path' => 'taxonomy/term/2', 'options' => array('query' => array('page' => 1))),
$settings['page_title_vocab_2'] . $settings['page_title_pager_pattern'], $settings['page_title_vocab_tags'] . $settings['page_title_pager_pattern'],
array('[current-page:page-title]' => $term['name'], '[current-page:page-number]' => 2), array('[current-page:page-title]' => $term['name'], '[current-page:page-number]' => 2),
'Taxonomy Title with pagenation suffix' 'Taxonomy Title with pagenation suffix'
); );
...@@ -188,6 +188,6 @@ class PageTitleTestCase extends DrupalWebTestCase { ...@@ -188,6 +188,6 @@ class PageTitleTestCase extends DrupalWebTestCase {
$this->pageTitleCheck('forum', $settings['page_title_forum_root_title'], array('[current-page:page-title]' => 'Forums', '[site:name]' => 'Drupal'), 'Forum Topic'); $this->pageTitleCheck('forum', $settings['page_title_forum_root_title'], array('[current-page:page-title]' => 'Forums', '[site:name]' => 'Drupal'), 'Forum Topic');
//Now test the forum forum... //Now test the forum forum...
$this->pageTitleCheck('forum/1', $settings['page_title_vocab_1'], array('[term:name]' => 'General discussion'), 'Forum Container'); $this->pageTitleCheck('forum/1', $settings['page_title_vocab_forums'], array('[term:name]' => 'General discussion'), 'Forum Container');
} }
} }
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment