mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-24 09:30:17 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-43757_master' of git://github.com/dmonllao/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7) 2014-01-27 21:11:03 +01:00
commit 2c8b15c50d
4 changed files with 56 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/behat/form_field/behat_form_editor.php
View File

@ -58,6 +58,7 @@ class behat_form_editor extends behat_form_field {
if ($editorid = $this->get_editor_id()) {
// Set the value to the iframe and save it to the textarea.
$value = str_replace('"', '\"', $value);
$this->session->executeScript('
tinyMCE.get("'.$editorid.'").setContent("' . $value . '");
tinyMCE.get("'.$editorid.'").save();

18
lib/behat/form_field/behat_form_field.php
View File

@ -114,10 +114,22 @@ class behat_form_field {
// Textareas are considered text based elements.
$tagname = strtolower($this->field->getTagName());
if ($tagname == 'textarea') {
return false;
}
if ($tagname == 'input') {
if (!$this->running_javascript()) {
return false;
}
// If there is an iframe with $id + _ifr there a TinyMCE editor loaded.
$xpath = '//iframe[@id="' . $this->field->getAttribute('id') . '_ifr"]';
if (!$this->session->getPage()->find('xpath', $xpath)) {
// Generic one if it is a normal textarea.
return false;
}
$classname = 'behat_form_editor';
} else if ($tagname == 'input') {
$type = $this->field->getAttribute('type');
switch ($type) {
case 'text':

2
lib/tests/behat/behat_hooks.php
View File

@ -321,7 +321,7 @@ class behat_hooks extends behat_base {
// All the run screenshots in the same parent dir.
if (!$screenshotsdirname = self::get_run_screenshots_dir()) {
$screenshotsdirname = self::$screenshotsdirname = date('Ymd_Hi');
$screenshotsdirname = self::$screenshotsdirname = date('Ymd_His');
$dir = $CFG->behat_screenshots_path . DIRECTORY_SEPARATOR . $screenshotsdirname;

39
message/tests/behat/message_participants.feature Normal file
View File

@ -0,0 +1,39 @@
@core @core_message
Feature: An user can message course participants
In order to communicate efficiently with my students
As a teacher
I need to message them all
@javascript
Scenario: An user can message multiple course participants including him/her self
Given the following "users" exists:
| username | firstname | lastname | email |
| teacher1 | Teacher | 1 | teacher1@asd.com |
| student1 | Student | 1 | student1@asd.com |
| student2 | Student | 2 | student2@asd.com |
| student3 | Student | 3 | student3@asd.com |
And the following "courses" exists:
| fullname | shortname | format |
| Course 1 | C1 | topics |
And the following "course enrolments" exists:
| user | course | role |
| teacher1 | C1 | editingteacher |
| student1 | C1 | student |
And I log in as "teacher1"
And I follow "Course 1"
And I follow "Participants"
When I click on "input[type='checkbox']" "css_element" in the "Teacher 1" "table_row"
And I click on "input[type='checkbox']" "css_element" in the "Student 1" "table_row"
And I select "Send a message" from "With selected users..."
And I fill the moodle form with:
| messagebody | Here it is, the message content |
And I press "Preview"
And I press "Send message"
And I follow "Home"
And I expand "My profile" node
And I follow "Messages"
And I select "Recent conversations" from "Message navigation:"
Then I should see "Here it is, the message content"
And I should see "Student 1"
And I click on "this conversation" "link" in the "//div[@class='singlemessage'][contains(., 'Teacher 1')]" "xpath_element"
And I should see "Here it is, the message content"