Merge branch 'MDL-51102-29' of git://github.com/andrewnicols/moodle into MOODLE_29_STABLE

2015-08-18 10:25:32 +08:00
parent 629975a563 14d54450e7
commit 58c274dcb3
1 changed files with 4 additions and 5 deletions
@@ -244,12 +244,11 @@ class behat_general extends behat_base {
     * @param int $seconds
     */
    public function i_wait_seconds($seconds) {
-
-        if (!$this->running_javascript()) {
-            throw new DriverException('Waits are disabled in scenarios without Javascript support');
+        if ($this->running_javascript()) {
+            $this->getSession()->wait($seconds * 1000, false);
+        } else {
+            sleep($seconds);
        }
-
-        $this->getSession()->wait($seconds * 1000, false);
    }

    /**