MDL-64669 core_message: New steps and selectors for messaging

moodle · Apr 8, 2019 · 1118af2 · 1118af2
1 parent 018aecd
commit 1118af2
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 2 deletions.
diff --git a/lib/behat/classes/partial_named_selector.php b/lib/behat/classes/partial_named_selector.php
@@ -89,6 +89,7 @@ public function __construct() {
         'file' => 'file',
         'filemanager' => 'filemanager',
         'group_message' => 'group_message',
+        'group_message_conversation' => 'group_message_conversation',
         'group_message_header' => 'group_message_header',
         'group_message_member' => 'group_message_member',
         'group_message_tab' => 'group_message_tab',
@@ -154,7 +155,10 @@ public function __construct() {
         , 'group_message' => <<<XPATH
         .//*[@data-conversation-id]//img[contains(@alt, %locator%)]/..
 XPATH
-        , 'group_message_header' => <<<XPATH
+        , 'group_message_conversation' => <<<XPATH
+            .//*[@data-region='message-drawer' and contains(., %locator%)]//div[@data-region='content-message-container']
+XPATH
+    , 'group_message_header' => <<<XPATH
         .//*[@data-region='message-drawer']//div[@data-region='header-container']//*[text()[contains(., %locator%)]]
 XPATH
     , 'group_message_member' => <<<XPATH

diff --git a/message/tests/behat/behat_message.php b/message/tests/behat/behat_message.php
@@ -48,6 +48,19 @@ public function i_open_messaging() {
         $this->execute("behat_general::i_click_on", [get_string('togglemessagemenu', 'core_message'), 'link']);
     }
 
+    /**
+     * Open the messaging conversation list.
+     *
+     * @Given /^I open the "(?P<tab_string>(?:[^"]|\\")*)" conversations list/
+     * @param string $tab
+     */
+    public function i_open_the_conversations_list(string $tab) {
+        $this->execute('behat_general::i_click_on', [
+            $this->escape($tab),
+            'group_message_tab'
+        ]);
+    }
+
     /**
      * Open the messaging UI.
      *
@@ -153,7 +166,7 @@ public function i_send_message_in_the_message_area($messagecontent) {
             array("//textarea[@data-region='send-message-txt']", $this->escape($messagecontent))
         );
 
-        $this->execute("behat_forms::press_button", get_string('send', 'message'));
+        $this->execute("behat_forms::press_button", get_string('sendmessage', 'message'));
     }
 
     /**
@@ -204,4 +217,19 @@ public function i_open_contact_menu() {
             )
         );
     }
+
+    /**
+     * Select a user in a specific messaging UI conversations list.
+     *
+     * @Given /^I select "(?P<conv_name_string>(?:[^"]|\\")*)" conversation in the "(?P<list_name_string>(?:[^"]|\\")*)" conversations list$/
+     * @param string $convname
+     * @param string $listname
+     */
+    public function i_select_conversation_in_the_conversations_list(string $convname, string $listname) {
+        $xpath = '//*[@data-region="message-drawer"]//div[@data-region="view-overview-'.
+            $this->escape($listname).
+            '"]//*[@data-conversation-id]//img[contains(@alt,"'.
+            $this->escape($convname).'")]';
+        $this->execute('behat_general::i_click_on', array($xpath, 'xpath_element'));
+    }
 }