From 1a11bf4706319b232b12b5f1cc33f782b836b45a Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 21 Aug 2019 08:23:59 +0800
Subject: [PATCH 1/3] MDL-66378 behat: All args are required for
 document.evaluate

---
 lib/tests/behat/behat_general.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/tests/behat/behat_general.php b/lib/tests/behat/behat_general.php
index 7e1b04a64a4..e0f2901abde 100644
--- a/lib/tests/behat/behat_general.php
+++ b/lib/tests/behat/behat_general.php
@@ -869,8 +869,8 @@ class behat_general extends behat_base {
             // this DOM method instead.
             $js = <<<EOF
 (function() {
-    var a = document.evaluate("{$prexpath}", document).iterateNext();
-    var b = document.evaluate("{$postxpath}", document).iterateNext();
+    var a = document.evaluate("{$prexpath}", document, null, XPathResult.ANY_TYPE, null).iterateNext();
+    var b = document.evaluate("{$postxpath}", document, null, XPathResult.ANY_TYPE, null).iterateNext();
     return a.compareDocumentPosition(b) & Node.DOCUMENT_POSITION_FOLLOWING;
 })()
 EOF;

From bf52d11f1ee6c9f0e8ee0ad8b26128e3ddf688b6 Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 21 Aug 2019 08:39:28 +0800
Subject: [PATCH 2/3] MDL-66378 grade: Set window size to large for rubric
 tests

---
 grade/grading/form/rubric/tests/behat/grade_calculation.feature | 1 +
 1 file changed, 1 insertion(+)

diff --git a/grade/grading/form/rubric/tests/behat/grade_calculation.feature b/grade/grading/form/rubric/tests/behat/grade_calculation.feature
index 687f1a49c7e..8cf1d3957dd 100644
--- a/grade/grading/form/rubric/tests/behat/grade_calculation.feature
+++ b/grade/grading/form/rubric/tests/behat/grade_calculation.feature
@@ -23,6 +23,7 @@ Feature: Converting rubric score to grades
       | activity   | name              | intro | course | idnumber    | grade   | advancedgradingmethod_submissions |
       | assign     | Test assignment 1 | Test  | C1     | assign1     | <grade> | rubric                            |
     When I log in as "teacher1"
+    And I change window size to "large"
     And I am on "Course 1" course homepage with editing mode on
     And I go to "Test assignment 1" advanced grading definition page
     And I set the following fields to these values:

From 3c3a806f6b57da2b02b46b396632412ccdb9e353 Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 21 Aug 2019 08:39:45 +0800
Subject: [PATCH 3/3] MDL-66378 behat: Correct grammar of resize step

---
 lib/tests/behat/behat_general.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/tests/behat/behat_general.php b/lib/tests/behat/behat_general.php
index e0f2901abde..07902bb1ecc 100644
--- a/lib/tests/behat/behat_general.php
+++ b/lib/tests/behat/behat_general.php
@@ -1215,6 +1215,7 @@ EOF;
      *
      * @throws ExpectationException
      * @Then /^I change (window|viewport) size to "(small|medium|large|\d+x\d+)"$/
+     * @Then /^I change the (window|viewport) size to "(small|medium|large|\d+x\d+)"$/
      * @param string $windowsize size of the window (small|medium|large|wxh).
      */
     public function i_change_window_size_to($windowviewport, $windowsize) {