Commit 60524be4 authored by Dries's avatar Dries

- Patch #345632 by boombatower: corrected assertTitle logic and added...

- Patch #345632 by boombatower: corrected assertTitle logic and added assertNoTitle for completeness.
parent 8802e0d3
......@@ -1705,7 +1705,23 @@ protected function assertNoPattern($pattern, $message = 'Pattern %s not found',
* 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);
}
/**
......
......@@ -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;
......
Markdown is supported
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