mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-22 16:40:07 +01:00
Code Issues Projects Releases Wiki Activity

MDL-48374 behat: improved page load detection

Browse Source 
Check that page load detection was correctly started before testing that a
new page was loaded.

Without this, it is possible to have mutliple subsequent cases of:
    And a new page should have loaded since I started watching

Without first starting the page load detection.
This commit is contained in:
Andrew Nicols 2014-12-02 08:57:38 +08:00 committed by Dan Poltawski
parent 951af91e08
commit 1b2c35af34
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/tests/behat/behat_general.php
View File

@ -63,6 +63,12 @@ class behat_general extends behat_base {
*/
const PAGE_LOAD_DETECTION_STRING = 'new_page_not_loaded_since_behat_started_watching';
/**
* @var $pageloaddetectionrunning boolean Used to ensure that page load detection was started before a page reload
* was checked for.
*/
private $pageloaddetectionrunning = null;
/**
* Opens Moodle homepage.
*
@ -1246,6 +1252,8 @@ class behat_general extends behat_base {
throw new ExpectationException('Page load expectation error: page reloads are already been watched for.');
}
$this->pageloaddetectionrunning = true;
$this->getSession()->evaluateScript(
'var span = document.createElement("span");
span.setAttribute("data-rel", "' . self::PAGE_LOAD_DETECTION_STRING . '");
@ -1269,6 +1277,15 @@ class behat_general extends behat_base {
$this->getSession()
);
}
if (!$this->pageloaddetectionrunning) {
throw new ExpectationException(
'Page load expectation error: page load tracking was not started.',
$this->getSession());
}
// Cancel the trakcing of pageloaddetectionrunning.
$this->pageloaddetectionrunning = false;
}
/**