Merge branch 'MDL-48318-28' of git://github.com/lameze/moodle into MO…

…ODLE_28_STABLE
moodle · Dec 16, 2014 · 43c3b0e · 43c3b0e
2 parents 73c991d + e784850
commit 43c3b0e
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/lib/tests/behat/behat_hooks.php b/lib/tests/behat/behat_hooks.php
@@ -407,7 +407,18 @@ protected function wait_for_pending_js() {
         for ($i = 0; $i < self::EXTENDED_TIMEOUT * 10; $i++) {
             $pending = '';
             try {
-                $jscode = 'return ' . self::PAGE_READY_JS . ' ? "" : M.util.pending_js.join(":");';
+                $jscode =
+                    'if (typeof M === "undefined") {
+                        if (document.readyState === "complete") {
+                            return "";
+                        } else {
+                            return "incomplete";
+                        }
+                    } else if (' . self::PAGE_READY_JS . ') {
+                        return "";
+                    } else {
+                        return M.util.pending_js.join(":");
+                    }';
                 $pending = $this->getSession()->evaluateScript($jscode);
             } catch (NoSuchWindow $nsw) {
                 // We catch an exception here, in case we just closed the window we were interacting with.