Merge branch 'MDL-76398-400' of https://github.com/paulholden/moodle …

…into MOODLE_400_STABLE
moodle · Dec 11, 2022 · 2d3acb5 · 2d3acb5
2 parents e4b7d8b + 91e9692
commit 2d3acb5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/lib/behat/classes/partial_named_selector.php b/lib/behat/classes/partial_named_selector.php
@@ -147,7 +147,7 @@ public function __construct() {
     descendant::*[
         contains(concat(' ', normalize-space(@class), ' '), ' dropdown-toggle ')
             and
-        contains(normalize-space(.), %locator%)
+        (contains(normalize-space(.), %locator%) or descendant::*[%titleMatch%])
     ]
 ]
 XPATH

diff --git a/reportbuilder/tests/behat/behat_reportbuilder.php b/reportbuilder/tests/behat/behat_reportbuilder.php
@@ -109,7 +109,11 @@ public function i_set_the_column_aggregation_to(string $column, string $aggregat
      * @param string $row
      */
     public function i_press_action_in_the_report_row(string $action, string $row): void {
-        $this->execute('behat_action_menu::i_open_the_action_menu_in', [$this->escape($row), 'table_row']);
-        $this->execute('behat_action_menu::i_choose_in_the_open_action_menu', [$this->escape($action)]);
+        $this->execute('behat_action_menu::i_choose_in_the_named_menu_in_container', [
+            $this->escape($action),
+            get_string('actions', 'core_reportbuilder'),
+            $this->escape($row),
+            'table_row',
+        ]);
     }
 }