From 9a1f4922bd486b34f1edcae6a140787e3cfd4f38 Mon Sep 17 00:00:00 2001 From: David Monllao Date: Thu, 23 May 2013 13:18:51 +0800 Subject: [PATCH] MDL-39795 behat: Improving find-texts-in-page-contents performance --- lib/tests/behat/behat_general.php | 26 ++++++++++++++++++++++---- lib/tests/behat/behat_hooks.php | 18 +++++++++++------- 2 files changed, 33 insertions(+), 11 deletions(-) diff --git a/lib/tests/behat/behat_general.php b/lib/tests/behat/behat_general.php index 5a2ba31e04a..c30c4c31e52 100644 --- a/lib/tests/behat/behat_general.php +++ b/lib/tests/behat/behat_general.php @@ -214,23 +214,41 @@ class behat_general extends behat_base { /** * Checks, that page contains specified text. * - * @see Behat\MinkExtension\Context\MinkContext * @Then /^I should see "(?P(?:[^"]|\\")*)"$/ + * @throws ExpectationException * @param string $text */ public function assert_page_contains_text($text) { - $this->assertSession()->pageTextContains($text); + + $xpathliteral = $this->getSession()->getSelectorsHandler()->xpathLiteral($text); + $xpath = "/descendant::*[contains(., " . $xpathliteral. ")]"; + + // Wait until it finds the text, otherwise custom exception. + try { + $this->find('xpath', $xpath); + } catch (ElementNotFoundException $e) { + throw new ExpectationException('"' . $text . '" text was not found in the page', $this->getSession()); + } } /** * Checks, that page doesn't contain specified text. * - * @see Behat\MinkExtension\Context\MinkContext * @Then /^I should not see "(?P(?:[^"]|\\")*)"$/ + * @throws ExpectationException * @param string $text */ public function assert_page_not_contains_text($text) { - $this->assertSession()->pageTextNotContains($text); + + $xpathliteral = $this->getSession()->getSelectorsHandler()->xpathLiteral($text); + $xpath = "/descendant::*[not(contains(., " . $xpathliteral. "))]"; + + // Wait until it finds the text, otherwise custom exception. + try { + $this->find('xpath', $xpath); + } catch (ElementNotFoundException $e) { + throw new ExpectationException('"' . $text . '" text was found in the page', $this->getSession()); + } } /** diff --git a/lib/tests/behat/behat_hooks.php b/lib/tests/behat/behat_hooks.php index 5cc8112cb65..3c297c2cb27 100644 --- a/lib/tests/behat/behat_hooks.php +++ b/lib/tests/behat/behat_hooks.php @@ -257,14 +257,18 @@ class behat_hooks extends behat_base { } // Any other backtrace. - $backtracespattern = '/(line [0-9]* of [^:]*: call to [\->&;:a-zA-Z_\x7f-\xff][\->&;:a-zA-Z0-9_\x7f-\xff]*)/'; - if (preg_match_all($backtracespattern, $this->getSession()->getPage()->getContent(), $backtraces)) { - $msgs = array(); - foreach ($backtraces[0] as $backtrace) { - $msgs[] = $backtrace . '()'; + // First looking through xpath as it is faster than get and parse the whole page contents, + // we get the contents and look for matches once we found something to suspect that there is a backtrace. + if ($this->getSession()->getDriver()->find("(//html/descendant::*[contains(., ': call to ')])[1]")) { + $backtracespattern = '/(line [0-9]* of [^:]*: call to [\->&;:a-zA-Z_\x7f-\xff][\->&;:a-zA-Z0-9_\x7f-\xff]*)/'; + if (preg_match_all($backtracespattern, $this->getSession()->getPage()->getContent(), $backtraces)) { + $msgs = array(); + foreach ($backtraces[0] as $backtrace) { + $msgs[] = $backtrace . '()'; + } + $msg = "Other backtraces found:\n" . implode("\n", $msgs); + throw new \Exception(htmlentities($msg)); } - $msg = "Other backtraces found:\n" . implode("\n", $msgs); - throw new \Exception(htmlentities($msg)); } } catch (NoSuchWindow $e) {