From 8662be1d8591a01d7eb110c95f26a718963813c2 Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 25 Aug 2021 14:01:57 +0800
Subject: [PATCH] MDL-58579 core_message: Refine behat steps to use message
 drawer

---
 message/tests/behat/behat_message.php | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/message/tests/behat/behat_message.php b/message/tests/behat/behat_message.php
index 28731d904b6..e1948ae83fb 100644
--- a/message/tests/behat/behat_message.php
+++ b/message/tests/behat/behat_message.php
@@ -195,16 +195,21 @@ XPATH
      * @param string $string the search string.
      */
     public function i_search_for_string_in_messaging($string) {
-        $this->execute('behat_general::i_click_on', [get_string('search', 'core'), 'field']);
+        $messagedrawer = $this->find('css', '[data-region="message-drawer"]');
+        $this->execute('behat_general::i_click_on_in_the', [
+            get_string('search', 'core'), 'field',
+            $messagedrawer, 'NodeElement'
+        ]);
 
-        $this->execute('behat_forms::i_set_the_field_with_xpath_to',
-            [
-                "//*[@data-region='message-drawer']//input[@data-region='search-input']",
-                $this->escape($string)
-            ]
-        );
+        $this->execute('behat_forms::i_set_the_field_with_xpath_to', [
+            "//*[@data-region='message-drawer']//input[@data-region='search-input']",
+            $this->escape($string)
+        ]);
 
-        $this->execute('behat_general::i_click_on', ['[data-action="search"]', 'css_element']);
+        $this->execute('behat_general::i_click_on_in_the', [
+            '[data-action="search"]', 'css_element',
+            $messagedrawer, 'NodeElement'
+        ]);
 
         $this->execute('behat_general::wait_until_the_page_is_ready');
     }