Merge branch 'MDL-62139-master-fix3' of git://github.com/damyon/moodle

admin/tool/policy/tests/behat/consent.feature

@@ -420,7 +420,7 @@ Feature: User must accept policy managed by this plugin when logging in and sign
     # Create new version of the policy document.
     And I log in as "admin"
     And I navigate to "Users > Privacy and policies > Manage policies" in site administration
-    When I follow "Actions"
+    # Menu is already open because javascript is disabled.
     Then I should see "View"
     And I should see "Edit"
     And I should see "Set status to \"Inactive\""

theme/boost/tests/behat/behat_theme_boost_behat_action_menu.php

@@ -39,7 +39,7 @@ class behat_theme_boost_behat_action_menu extends behat_action_menu {
 
     public function i_open_the_action_menu_in($element, $selectortype) {
         // Gets the node based on the requested selector type and locator.
-        $node = $this->get_node_in_container("css_element", "[role=menuitem][aria-haspopup=true]", $selectortype, $element);
+        $node = $this->get_node_in_container("css_element", "[role=button][aria-haspopup=true]", $selectortype, $element);
 
         // Check if it is not already opened.
         if ($node->getAttribute('aria-expanded') === 'true') {