L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-64670-master' of git://github.com/aanabit/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2019-03-12 18:05:17 +01:00
parent d87696dadb 75e7553aa3
commit da97d01192
4 changed files with 216 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/behat/classes/partial_named_selector.php
+19 -14
View File
@@ -65,8 +65,6 @@ class behat_partial_named_selector extends \Behat\Mink\Selector\PartialNamedSele
'fieldset' => 'fieldset',
'icon' => 'icon',
'list_item' => 'list_item',
'message_area_region' => 'message_area_region',
'message_area_region_content' => 'message_area_region_content',
'question' => 'question',
'region' => 'region',
'section' => 'section',
@@ -90,13 +88,14 @@ class behat_partial_named_selector extends \Behat\Mink\Selector\PartialNamedSele
'fieldset' => 'fieldset',
'file' => 'file',
'filemanager' => 'filemanager',
'group_message' => 'group_message',
'group_message_header' => 'group_message_header',
'group_message_member' => 'group_message_member',
'group_message_tab' => 'group_message_tab',
'icon' => 'icon',
'link' => 'link',
'link_or_button' => 'link_or_button',
'list_item' => 'list_item',
'message_area_action' => 'message_area_action',
'message_area_region' => 'message_area_region',
'message_area_region_content' => 'message_area_region_content',
'optgroup' => 'optgroup',
'option' => 'option',
'question' => 'question',
@@ -151,6 +150,21 @@ XPATH
and
normalize-space(descendant::*[contains(concat(' ', normalize-space(@class), ' '), ' modal-header ')] = %locator%)
]
XPATH
, 'group_message' => <<<XPATH
.//*[@data-conversation-id]//img[contains(@alt, %locator%)]/..
XPATH
, 'group_message_header' => <<<XPATH
.//*[@data-region='message-drawer']//div[@data-region='header-container']//*[text()[contains(., %locator%)]]
XPATH
, 'group_message_member' => <<<XPATH
.//*[@data-region='message-drawer']//div[@data-region='group-info-content-container']
//div[@class='list-group' and not(contains(@class, 'hidden'))]//*[text()[contains(., %locator%)]] |
.//*[@data-region='message-drawer']//div[@data-region='group-info-content-container']
//div[@data-region='empty-message-container' and not(contains(@class, 'hidden'))]//*[text()[contains(., %locator%)]]
XPATH
, 'group_message_tab' => <<<XPATH
.//*[@data-region='message-drawer']//button[@data-toggle='collapse']//*[text()[contains(., %locator%)]]/..
XPATH
, 'icon' => <<<XPATH
.//*[contains(concat(' ', normalize-space(@class), ' '), ' icon ') and ( contains(normalize-space(@title), %locator%))]
@@ -183,15 +197,6 @@ XPATH
XPATH
, 'form_row' => <<<XPATH
.//*[self::label or self::div[contains(concat(' ', @class, ' '), ' fstaticlabel ')]][contains(., %locator%)]/ancestor::*[contains(concat(' ', @class, ' '), ' fitem ')]
XPATH
, 'message_area_region' => <<<XPATH
.//div[@data-region='message-drawer']/descendant::*[@data-region = %locator%]
XPATH
, 'message_area_region_content' => <<<XPATH
.//div[@data-region='message-drawer']/descendant::*[@data-region-content = %locator%]
XPATH
, 'message_area_action' => <<<XPATH
.//div[@data-region='message-drawer']/descendant::*[@data-action = %locator%]
XPATH
, 'autocomplete_selection' => <<<XPATH
.//div[contains(concat(' ', normalize-space(@class), ' '), concat(' ', 'form-autocomplete-selection', ' '))]/span[@role='listitem'][contains(normalize-space(.), %locator%)]
message/tests/behat/behat_message.php
+53 -6
View File
@@ -37,6 +37,26 @@ require_once(__DIR__ . '/../../../lib/behat/behat_base.php');
*/
class behat_message extends behat_base {
/**
* Open the messaging UI.
*
* @Given /^I open messaging$/
*/
public function i_open_messaging() {
// Visit home page and follow messages.
$this->execute("behat_general::i_am_on_homepage");
$this->execute("behat_general::i_click_on", [get_string('togglemessagemenu', 'core_message'), 'link']);
}
/**
* Open the messaging UI.
*
* @Given /^I open messaging information$/
*/
public function i_open_messaging_information() {
$this->execute('behat_general::i_click_on', ["[data-action='view-group-info']", 'css_element']);
}
/**
* View the contact information of a user in the messages ui.
*
@@ -67,11 +87,7 @@ class behat_message extends behat_base {
* @param string $userfullname
*/
public function i_select_user_in_messaging($userfullname) {
// Visit home page and follow messages.
$this->execute("behat_general::i_am_on_homepage");
$this->execute("behat_general::i_click_on", [get_string('togglemessagemenu', 'core_message'), 'link']);
$this->i_open_messaging();
$this->execute('behat_general::i_click_on', [get_string('search', 'core'), 'field']);
@@ -100,7 +116,6 @@ class behat_message extends behat_base {
$this->execute('behat_general::wait_until_the_page_is_ready');
}
/**
* Sends a message to the specified user from the logged user. The user full name should contain the first and last names.
*
@@ -140,4 +155,36 @@ class behat_message extends behat_base {
$this->execute("behat_forms::press_button", get_string('send', 'message'));
}
/**
* Navigate back in the messages ui drawer.
*
* @Given /^I go back in "(?P<parent_element_string>(?:[^"]|\\")*)" message drawer$/
* @param string $parentelement
*/
public function i_go_back_in_message_drawer($parentelement) {
$this->execute('behat_general::i_click_on_in_the',
array(
'a[data-route-back]',
'css_element',
'[data-region="'.$this->escape($parentelement).'"]',
'css_element',
)
);
}
/**
* Select a user in the messaging UI.
*
* @Given /^I select "(?P<conversation_name_string>(?:[^"]|\\")*)" conversation in messaging$/
* @param string $conversationname
*/
public function i_select_conversation_in_messaging($conversationname) {
$this->execute('behat_general::i_click_on',
array(
$this->escape($conversationname),
'group_message',
)
);
}
}
message/tests/behat/group_conversation.feature
+54
View File
@@ -0,0 +1,54 @@
@core @core_message @javascript
Feature: Create conversations for course's groups
In order to manage a course group in a course
As a user
I need to be able to ensure group conversations reflect the memberships of course groups
Background:
Given the following "courses" exist:
| fullname | shortname | category | groupmode |
| Course 1 | C1 | 0 | 1 |
And the following "users" exist:
| username | firstname | lastname | email |
| teacher1 | Teacher | 1 | teacher1@example.com |
| student0 | Student | 0 | student0@example.com |
| student1 | Student | 1 | student1@example.com |
| student2 | Student | 2 | student2@example.com |
| student3 | Student | 3 | student3@example.com |
| student4 | Student | 4 | student4@example.com |
And the following "course enrolments" exist:
| user | course | role |
| teacher1 | C1 | editingteacher |
| student0 | C1 | student |
| student1 | C1 | student |
| student2 | C1 | student |
| student3 | C1 | student |
| student4 | C1 | student |
And the following "groups" exist:
| name | course | idnumber | enablemessaging |
| Group 1 | C1 | G1 | 1 |
| Group 2 | C1 | G2 | 1 |
| Group 3 | C1 | G3 | 0 |
And the following "group members" exist:
| user | group |
| teacher1 | G1 |
| student0 | G1 |
| student1 | G1 |
| student2 | G1 |
| student3 | G1 |
| teacher1 | G2 |
| teacher1 | G3 |
| student0 | G3 |
Scenario: Group conversations are restricted to members
Given I log in as "teacher1"
Then I open messaging
And "Group 1" "group_message" should exist
And "Group 2" "group_message" should exist
And "Group 3" "group_message" should not exist
And I log out
And I log in as "student1"
And I open messaging
And "Group 1" "group_message" should exist
And "Group 2" "group_message" should not exist
And "Group 3" "group_message" should not exist
theme/boost/tests/behat/group_conversation.feature
+90
View File
@@ -0,0 +1,90 @@
@javascript @theme_boost
Feature: Create conversations for course's groups in Boost theme
In order to manage a course group in a course
As a user
I need to be able to ensure group conversations reflect the memberships of course groups
Background:
Given the following "courses" exist:
| fullname | shortname | category | groupmode |
| Course 1 | C1 | 0 | 1 |
And the following "users" exist:
| username | firstname | lastname | email |
| teacher1 | Teacher | 1 | teacher1@example.com |
| student0 | Student | 0 | student0@example.com |
| student1 | Student | 1 | student1@example.com |
| student2 | Student | 2 | student2@example.com |
| student3 | Student | 3 | student3@example.com |
| student4 | Student | 4 | student4@example.com |
And the following "course enrolments" exist:
| user | course | role |
| teacher1 | C1 | editingteacher |
| student0 | C1 | student |
| student1 | C1 | student |
| student2 | C1 | student |
| student3 | C1 | student |
| student4 | C1 | student |
And the following "groups" exist:
| name | course | idnumber | enablemessaging |
| Group 1 | C1 | G1 | 1 |
| Group 2 | C1 | G2 | 1 |
| Group 3 | C1 | G3 | 0 |
And the following "group members" exist:
| user | group |
| teacher1 | G1 |
| student0 | G1 |
| student1 | G1 |
| student2 | G1 |
| student3 | G1 |
| teacher1 | G2 |
| teacher1 | G3 |
| student0 | G3 |
Scenario: View group conversation's participants numbers
Given I log in as "teacher1"
Then I open messaging
And I select "Group 1" conversation in messaging
And "5 participants" "group_message_header" should exist
And I go back in "view-conversation" message drawer
And I select "Group 2" conversation in messaging
And "1 participants" "group_message_header" should exist
Scenario: View group conversation's participants list
Given I log in as "teacher1"
Then I open messaging
# Check Group 1 participants list.
And I select "Group 1" conversation in messaging
And I open messaging information
And "Teacher 1" "group_message_member" should not exist
And "Student 0" "group_message_member" should exist
And "Student 1" "group_message_member" should exist
And "Student 2" "group_message_member" should exist
And "Student 3" "group_message_member" should exist
And "Student 4" "group_message_member" should not exist
And I go back in "group-info-content-container" message drawer
And I go back in "view-conversation" message drawer
# Check Group 2 participants list.
And I select "Group 2" conversation in messaging
And I open messaging information
And "Teacher 1" "group_message_member" should not exist
And "No participants" "group_message_member" should exist
And "Student 4" "group_message_member" should not exist
Scenario: Check group conversation members are synced when a new group member is added
Given I log in as "teacher1"
Then I am on "Course 1" course homepage
And I navigate to "Users > Groups" in current page administration
And I add "Student 4 (student4@example.com)" user to "Group 1" group members
And I add "Student 4 (student4@example.com)" user to "Group 2" group members
And I open messaging
And I select "Group 1" conversation in messaging
And "6 participants" "group_message_header" should exist
And I open messaging information
And "Student 4" "group_message_member" should exist
And I go back in "group-info-content-container" message drawer
And I go back in "view-conversation" message drawer
And I select "Group 2" conversation in messaging
And "2 participants" "group_message_header" should exist
And I open messaging information
And "No participants" "group_message_member" should not exist
And "Student 4" "group_message_member" should exist