From 47db34f2d1fafc20a6ca85b40005714b8fb0fc81 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Thu, 8 Jul 2010 12:22:59 +0000
Subject: [PATCH] - Patch #842966 by boombatower: link handling functionality
should use XPath normalize-space().
---
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 5433a5ff2369..dfe5d1dc8f5c 100644
--- a/modules/simpletest/drupal_web_test_case.php
+++ b/modules/simpletest/drupal_web_test_case.php
@@ -2117,7 +2117,7 @@ protected function getAllOptions(SimpleXMLElement $element) {
* TRUE if the assertion succeeded, FALSE otherwise.
*/
protected function assertLink($label, $index = 0, $message = '', $group = 'Other') {
- $links = $this->xpath('//a[text()=:label]', array(':label' => $label));
+ $links = $this->xpath('//a[normalize-space(text())=:label]', array(':label' => $label));
$message = ($message ? $message : t('Link with label %label found.', array('%label' => $label)));
return $this->assert(isset($links[$index]), $message, $group);
}
@@ -2137,7 +2137,7 @@ protected function assertLink($label, $index = 0, $message = '', $group = 'Other
* TRUE if the assertion succeeded, FALSE otherwise.
*/
protected function assertNoLink($label, $message = '', $group = 'Other') {
- $links = $this->xpath('//a[text()=:label]', array(':label' => $label));
+ $links = $this->xpath('//a[normalize-space(text())=:label]', array(':label' => $label));
$message = ($message ? $message : t('Link with label %label not found.', array('%label' => $label)));
return $this->assert(empty($links), $message, $group);
}
@@ -2199,7 +2199,7 @@ protected function assertNoLinkByHref($href, $message = '', $group = 'Other') {
*/
protected function clickLink($label, $index = 0) {
$url_before = $this->getUrl();
- $urls = $this->xpath('//a[text()=:label]', array(':label' => $label));
+ $urls = $this->xpath('//a[normalize-space(text())=:label]', array(':label' => $label));
if (isset($urls[$index])) {
$url_target = $this->getAbsoluteUrl($urls[$index]['href']);
--
GitLab