MDL-54589 behat: Don't allow floating headers for behat

safatshahin · Jun 20, 2016 · 6a51c58 · 6a51c58
1 parent fba0ac6
commit 6a51c58
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 5 deletions.
diff --git a/grade/report/grader/tests/behat/ajax_grader.feature b/grade/report/grader/tests/behat/ajax_grader.feature
@@ -47,8 +47,6 @@ Feature: Using the AJAX grading feature of Grader report to update grades and fe
     And the following config values are set as admin:
       | grade_report_showaverages | 0 |
       | grade_report_enableajax | 1 |
-    # Floating headers can fail to set value on some OS/Browsers, so do this test on large screens.
-    And I change window size to "large"
 
   @javascript
   Scenario: Use the grader report without editing, with AJAX on and quick feedback off

diff --git a/...e-gradereport_grader-gradereporttable/moodle-gradereport_grader-gradereporttable-debug.js b/...e-gradereport_grader-gradereporttable/moodle-gradereport_grader-gradereporttable-debug.js
@@ -402,6 +402,11 @@ FloatingHeaders.prototype = {
             return this;
         }
 
+        if (M.cfg.behatsiterunning) {
+            // If the behat site is running we don't want floating elements.
+            return;
+        }
+
         // Generate floating elements.
         this._setupFloatingUserColumn();
         this._setupFloatingUserHeader();

diff --git a/...dle-gradereport_grader-gradereporttable/moodle-gradereport_grader-gradereporttable-min.js b/...dle-gradereport_grader-gradereporttable/moodle-gradereport_grader-gradereporttable-min.js
diff --git a/.../moodle-gradereport_grader-gradereporttable/moodle-gradereport_grader-gradereporttable.js b/.../moodle-gradereport_grader-gradereporttable/moodle-gradereport_grader-gradereporttable.js
@@ -402,6 +402,11 @@ FloatingHeaders.prototype = {
             return this;
         }
 
+        if (M.cfg.behatsiterunning) {
+            // If the behat site is running we don't want floating elements.
+            return;
+        }
+
         // Generate floating elements.
         this._setupFloatingUserColumn();
         this._setupFloatingUserHeader();

diff --git a/grade/report/grader/yui/src/gradereporttable/js/floatingheaders.js b/grade/report/grader/yui/src/gradereporttable/js/floatingheaders.js
@@ -259,6 +259,11 @@ FloatingHeaders.prototype = {
             return this;
         }
 
+        if (M.cfg.behatsiterunning) {
+            // If the behat site is running we don't want floating elements.
+            return;
+        }
+
         // Generate floating elements.
         this._setupFloatingUserColumn();
         this._setupFloatingUserHeader();