From 3a2eff7145176693eb5ae3cd04b77ccebfa717b7 Mon Sep 17 00:00:00 2001 From: Dries Buytaert <dries@buytaert.net> Date: Sat, 19 Sep 2009 11:20:34 +0000 Subject: [PATCH] - Patch #553524 by John Morahan: escape link text in assertions. --- modules/simpletest/drupal_web_test_case.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/simpletest/drupal_web_test_case.php b/modules/simpletest/drupal_web_test_case.php index c49d3ad9a9e4..640d1f8c71fb 100644 --- a/modules/simpletest/drupal_web_test_case.php +++ b/modules/simpletest/drupal_web_test_case.php @@ -1728,7 +1728,7 @@ protected function getAllOptions(SimpleXMLElement $element) { */ 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 @@ protected function assertLink($label, $index = 0, $message = '', $group = 'Other */ 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 @@ protected function clickLink($label, $index = 0) { $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); -- GitLab