Merge branch 'MDL-66335' of https://github.com/timhunt/moodle

diff --cc lib/behat/behat_base.php
Simple merge

diff --cc mod/quiz/tests/behat/editing_add_from_question_bank.feature
index 2e8708e,e524562..717154a
--- 1/mod/quiz/tests/behat/editing_add_from_question_bank.feature
--- 2/mod/quiz/tests/behat/editing_add_from_question_bank.feature
+++ b/mod/quiz/tests/behat/editing_add_from_question_bank.feature
@@@ -37,17 -37,12 +37,15 @@@ Feature: Adding questions to a quiz fro
      And I set the following fields to these values:
        | Tags | bar |
      And I press "id_submitbutton"
-     And I am on "Course 1" course homepage
-     And I follow "Quiz 1"
-     And I navigate to "Edit quiz" in current page administration
+     And I am on the "Quiz 1" "mod_quiz > Edit" page
      And I open the "last" add to quiz menu
      And I follow "from question bank"
 +    Then I should see "foo" in the "question 01 name" "table_row"
 +    And I should see "bar" in the "question 02 name" "table_row"
 +    And I should see "qidnum" in the "question 02 name" "table_row"
      And I set the field "Filter by tags..." to "foo"
      And I press key "13" in the field "Filter by tags..."
 -    Then I should see "question 01 name" in the "categoryquestions" "table"
 +    And I should see "question 01 name" in the "categoryquestions" "table"
      And I should not see "question 02 name" in the "categoryquestions" "table"
  
    Scenario: The question modal can be paginated

diff --cc mod/quiz/tests/behat/editing_add_random.feature
index 3e3a53b,911bc95..87783bc
--- 1/mod/quiz/tests/behat/editing_add_random.feature
--- 2/mod/quiz/tests/behat/editing_add_random.feature
+++ b/mod/quiz/tests/behat/editing_add_random.feature
@@@ -35,12 -35,10 +35,10 @@@ Feature: Adding random questions to a q
        | Tags | foo |
      And I press "id_submitbutton"
      And I click on "Manage tags" "link" in the "question 2 name" "table_row"
 -    And I set the following fields to these values:
 +    And I set the following fields in the "Question tags" "dialogue" to these values:
        | Tags | bar |
      And I press "Save changes"
-     And I am on "Course 1" course homepage
-     And I follow "Quiz 1"
-     And I navigate to "Edit quiz" in current page administration
+     And I am on the "Quiz 1" "mod_quiz > Edit" page
      And I open the "last" add to quiz menu
      And I follow "a random question"
      And I open the autocomplete suggestions list