summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2009-09-19 11:20:34 +0000
committerDries Buytaert <dries@buytaert.net>2009-09-19 11:20:34 +0000
commit3a2eff7145176693eb5ae3cd04b77ccebfa717b7 (patch)
tree53010b2d55ab36f23488a729eb321faa3174104b
parent652f90d1c013816e6771bf9df64a7f9bc0d3fc6b (diff)
downloadbrdo-3a2eff7145176693eb5ae3cd04b77ccebfa717b7.tar.gz
brdo-3a2eff7145176693eb5ae3cd04b77ccebfa717b7.tar.bz2
- Patch #553524 by John Morahan: escape link text in assertions.
-rw-r--r--modules/simpletest/drupal_web_test_case.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/simpletest/drupal_web_test_case.php b/modules/simpletest/drupal_web_test_case.php
index c49d3ad9a..640d1f8c7 100644
--- a/modules/simpletest/drupal_web_test_case.php
+++ b/modules/simpletest/drupal_web_test_case.php
@@ -1728,7 +1728,7 @@ class DrupalWebTestCase extends DrupalTestCase {
*/
protected function assertLink($label, $index = 0, $message = '', $group = 'Other') {
$links = $this->xpath('//a[text()="' . $label . '"]');
- $message = ($message ? $message : t('Link with label "!label" found.', array('!label' => $label)));
+ $message = ($message ? $message : t('Link with label %label found.', array('%label' => $label)));
return $this->assert(isset($links[$index]), $message, $group);
}
@@ -1748,7 +1748,7 @@ class DrupalWebTestCase extends DrupalTestCase {
*/
protected function assertNoLink($label, $message = '', $group = 'Other') {
$links = $this->xpath('//a[text()="' . $label . '"]');
- $message = ($message ? $message : t('Link with label "!label" not found.', array('!label' => $label)));
+ $message = ($message ? $message : t('Link with label %label not found.', array('%label' => $label)));
return $this->assert(empty($links), $message, $group);
}
@@ -1775,7 +1775,7 @@ class DrupalWebTestCase extends DrupalTestCase {
$url_target = $this->getAbsoluteUrl($urls[$index]['href']);
}
- $this->assertTrue(isset($urls[$index]), t('Clicked link "!label" (!url_target) from !url_before', array('!label' => $label, '!url_target' => $url_target, '!url_before' => $url_before)), t('Browser'));
+ $this->assertTrue(isset($urls[$index]), t('Clicked link %label (@url_target) from @url_before', array('%label' => $label, '@url_target' => $url_target, '@url_before' => $url_before)), t('Browser'));
if (isset($urls[$index])) {
return $this->drupalGet($url_target);