diff options
author | Dries Buytaert <dries@buytaert.net> | 2008-12-11 20:11:40 +0000 |
---|---|---|
committer | Dries Buytaert <dries@buytaert.net> | 2008-12-11 20:11:40 +0000 |
commit | 60524be44b6b6a7c276514643ae8430840de2ab1 (patch) | |
tree | 5a73b87db42c5a155c8a235fcfc477ec0404c510 /modules | |
parent | 8802e0d3aff7b993a0325e46eb33f3855a72bbe3 (diff) | |
download | brdo-60524be44b6b6a7c276514643ae8430840de2ab1.tar.gz brdo-60524be44b6b6a7c276514643ae8430840de2ab1.tar.bz2 |
- Patch #345632 by boombatower: corrected assertTitle logic and added assertNoTitle for completeness.
Diffstat (limited to 'modules')
-rw-r--r-- | modules/simpletest/drupal_web_test_case.php | 18 | ||||
-rw-r--r-- | modules/simpletest/simpletest.test | 1 |
2 files changed, 18 insertions, 1 deletions
diff --git a/modules/simpletest/drupal_web_test_case.php b/modules/simpletest/drupal_web_test_case.php index 679d51a4d..ce94a858c 100644 --- a/modules/simpletest/drupal_web_test_case.php +++ b/modules/simpletest/drupal_web_test_case.php @@ -1705,7 +1705,23 @@ class DrupalWebTestCase { * TRUE on pass, FALSE on fail. */ protected function assertTitle($title, $message, $group = 'Other') { - return $this->assert($this->xpath('//title[text()="' . $title . '"]') !== FALSE, $message, $group); + return $this->assertTrue($this->xpath('//title[text()="' . $title . '"]'), $message, $group); + } + + /** + * Pass if the page title is not the given string. + * + * @param $title + * The string the title should not be. + * @param $message + * Message to display. + * @param $group + * The group this message belongs to. + * @return + * TRUE on pass, FALSE on fail. + */ + protected function assertNoTitle($title, $message, $group = 'Other') { + return $this->assertFalse($this->xpath('//title[text()="' . $title . '"]'), $message, $group); } /** diff --git a/modules/simpletest/simpletest.test b/modules/simpletest/simpletest.test index 0aa830115..40d48f435 100644 --- a/modules/simpletest/simpletest.test +++ b/modules/simpletest/simpletest.test @@ -46,6 +46,7 @@ class SimpleTestTestCase extends DrupalWebTestCase { $this->drupalGet('node'); $this->assertTrue($this->drupalGetHeader('Date'), t('An HTTP header was received.')); $this->assertTitle(variable_get('site_name', 'Drupal'), t('Site title matches.')); + $this->assertNoTitle('Foo', t('Site title does not match.')); // Make sure that we are locked out of the installer when prefixing // using the user-agent header. This is an important security check. global $base_url; |