From 49a51c70b8dc6417999ed1b99bcae3bcb58a6449 Mon Sep 17 00:00:00 2001 From: David Rothstein Date: Sat, 1 Nov 2014 20:22:40 -0400 Subject: Issue #1452896 by Mile23, marthinal, Freso, kid_icarus, joshi.rohit100, alexpott, tim.plunkett, jhodgdon: Fixed PHP notice in clickLink if link does not exist. --- modules/simpletest/drupal_web_test_case.php | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'modules/simpletest') diff --git a/modules/simpletest/drupal_web_test_case.php b/modules/simpletest/drupal_web_test_case.php index a46e171dd..2a5aae8a9 100644 --- a/modules/simpletest/drupal_web_test_case.php +++ b/modules/simpletest/drupal_web_test_case.php @@ -2682,28 +2682,26 @@ class DrupalWebTestCase extends DrupalTestCase { * * Will click the first link found with this link text by default, or a later * one if an index is given. Match is case sensitive with normalized space. - * The label is translated label. There is an assert for successful click. + * The label is translated label. + * + * If the link is discovered and clicked, the test passes. Fail otherwise. * * @param $label * Text between the anchor tags. * @param $index * Link position counting from zero. * @return - * Page on success, or FALSE on failure. + * Page contents on success, or FALSE on failure. */ protected function clickLink($label, $index = 0) { $url_before = $this->getUrl(); $urls = $this->xpath('//a[normalize-space(text())=:label]', array(':label' => $label)); - if (isset($urls[$index])) { $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')); - - if (isset($url_target)) { + $this->pass(t('Clicked link %label (@url_target) from @url_before', array('%label' => $label, '@url_target' => $url_target, '@url_before' => $url_before)), 'Browser'); return $this->drupalGet($url_target); } + $this->fail(t('Link %label does not exist on @url_before', array('%label' => $label, '@url_before' => $url_before)), 'Browser'); return FALSE; } -- cgit v1.2.3