mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'behat_goutte_nowait' of https://github.com/tlevi/moodle

Browse Source
This commit is contained in:
Dan Poltawski 2015-02-03 13:08:32 +00:00
commit 8448af7d86
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/behat/behat_base.php
View File

@ -302,6 +302,11 @@ class behat_base extends Behat\MinkExtension\Context\RawMinkContext {
$loops = $timeout;
}
// DOM will never change on non-javascript case; do not wait or try again.
if (!$this->running_javascript()) {
$loops = 1;
}
for ($i = 0; $i < $loops; $i++) {
// We catch the exception thrown by the step definition to execute it again.
try {
@ -320,10 +325,12 @@ class behat_base extends Behat\MinkExtension\Context\RawMinkContext {
continue;
}
if ($microsleep) {
usleep(100000);
} else {
sleep(1);
if ($this->running_javascript()) {
if ($microsleep) {
usleep(100000);
} else {
sleep(1);
}
}
}

4
lib/tests/behat/behat_forms.php
View File

@ -98,6 +98,10 @@ class behat_forms extends behat_base {
* @return void
*/
protected function expand_all_fields() {
// Expand only if JS mode, else not needed.
if (!$this->running_javascript()) {
return;
}
// We already know that we waited for the DOM and the JS to be loaded, even the editor
// so, we will use the reduced timeout as it is a common task and we should save time.