Merge branch 'wip-mdl-49110-m28' of https://github.com/rajeshtaneja/moodle into MOODLE_28_STABLE

2015-03-03 16:27:03 +08:00
parent e2d00f5195 6da3248b9f
commit da9dfe70d4
2 changed files with 15 additions and 4 deletions
@@ -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.