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

Merge branch 'MDL-64664-36' of git://github.com/cescobedo/moodle into MOODLE_36_STABLE

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2019-03-27 22:58:40 +01:00
parent 25d5103a4c d0770f8154
commit 4c627b6a57
3 changed files with 123 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/tests/behat/behat_data_generators.php
+29
View File
@@ -183,6 +183,11 @@ class behat_data_generators extends behat_base {
'category' => 'categoryid',
)
),
'message contacts' => array(
'datagenerator' => 'message_contacts',
'required' => array('user', 'contact'),
'switchids' => array('user' => 'userid', 'contact' => 'contactid')
),
);
/**
@@ -837,4 +842,28 @@ class behat_data_generators extends behat_base {
return $context;
}
/**
* Adds user to contacts
*
* @param array $data
* @return void
*/
protected function process_message_contacts($data) {
\core_message\api::add_contact($data['userid'], $data['contactid']);
}
/**
* Gets the contact id from it's username.
* @throws Exception
* @param string $username
* @return int
*/
protected function get_contact_id($username) {
global $DB;
if (!$id = $DB->get_field('user', 'id', array('username' => $username))) {
throw new Exception('The specified user with username "' . $username . '" does not exist');
}
return $id;
}
}
message/tests/behat/behat_message.php
+17
View File
@@ -187,4 +187,21 @@ class behat_message extends behat_base {
)
);
}
/**
* Open the contact menu.
*
* @Given /^I open contact menu$/
*/
public function i_open_contact_menu() {
$this->execute('behat_general::wait_until_the_page_is_ready');
$this->execute('behat_general::i_click_on_in_the',
array(
'button',
'css_element',
'[data-region="message-drawer"] [data-region="header-container"]',
'css_element',
)
);
}
}
message/tests/behat/message_drawer_manage_contacts.feature
+77
View File
@@ -0,0 +1,77 @@
@core @core_message @javascript
Feature: Manage contacts
In order to communicate with fellow users
As a user
I need to be able to add, decline and remove users
Background:
Given the following "users" exist:
| username | firstname | lastname | email |
| 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 "message contacts" exist:
| user | contact |
| student1 | student2 |
And the following config values are set as admin:
| messaging | 1 |
| messagingallusers | 1 |
Scenario: Send a 'contact request' to someone to add a contact
Given I log in as "student1"
Then I open messaging
And I select "Student 4" user in messaging
And I open contact menu
And I click on "Add to contacts" "link"
And I click on "Add" "button"
And I log out
And I log in as "student3"
And I select "Student 4" user in messaging
And I open contact menu
And I click on "Add to contacts" "link"
And I click on "Add" "button"
And I log out
And I log in as "student4"
Then I should see "2" in the "//*[@data-region='count-container']" "xpath_element"
And I open messaging
And I click on "Contacts" "link"
Then I should see "2" in the "//div[@data-region='view-contacts']//*[@data-region='contact-request-count']" "xpath_element"
And I click on "Requests" "link_or_button"
And I click on "Student 1 Would like to contact you" "link"
And I click on "Accept and add to contacts" "link_or_button"
And I log out
And I log in as "student1"
And I open messaging
And I click on "Contacts" "link"
And I should see "Student 4" in the "//*[@data-section='contacts']" "xpath_element"
Scenario: Decline a 'contact request' from someone
Given I log in as "student1"
Then I open messaging
And I select "Student 3" user in messaging
And I open contact menu
And I click on "Add to contacts" "link"
And I click on "Add" "button"
And I log out
And I log in as "student3"
Then I should see "1" in the "//*[@data-region='count-container']" "xpath_element"
And I open messaging
And I click on "Contacts" "link"
Then I should see "1" in the "//div[@data-region='view-contacts']//*[@data-region='contact-request-count']" "xpath_element"
And I click on "Requests" "link_or_button"
And I click on "Student 1 Would like to contact you" "link"
And I click on "Decline" "link_or_button"
And I open contact menu
Then I should see "Add to contacts" in the "//div[@data-region='header-container']" "xpath_element"
Scenario: Remove existing contact
Given I log in as "student1"
Then I open messaging
And I click on "Contacts" "link"
And I click on "Student 2" "link" in the "//*[@data-section='contacts']" "xpath_element"
And I open contact menu
And I click on "Remove from contacts" "link"
And I click on "Remove" "button"
And I go back in "view-conversation" message drawer
And I should see "No contacts" in the "//*[@data-region='empty-message-container']" "xpath_element"