mirror of
https://github.com/moodle/moodle.git
synced 2025-03-14 04:30:15 +01:00
Merge branch 'MDL-38785_master' of git://github.com/dmonllao/moodle
This commit is contained in:
Eloy Lafuente (stronk7)
commit
80430739d9
35
blocks/comments/tests/behat/add_comment.feature
Normal file
35
blocks/comments/tests/behat/add_comment.feature
Normal file
@ -0,0 +1,35 @@
|
||||
@core_comment
|
||||
Feature: Add a comment to the comments block
|
||||
In order to comment on a conversation or a topic
|
||||
As a moodle user
|
||||
In need to add comments to courses
|
||||
|
||||
Background:
|
||||
Given the following "courses" exists:
|
||||
| fullname | shortname | category |
|
||||
| Course 1 | C1 | 0 |
|
||||
And the following "users" exists:
|
||||
| username | firstname | lastname | email |
|
||||
| teacher1 | Teacher | Frist | teacher1@asd.com |
|
||||
| student1 | Student | First | student1@asd.com |
|
||||
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 turn editing mode on
|
||||
And I add the "Comments" block
|
||||
And I log out
|
||||
And I log in as "student1"
|
||||
And I follow "Course 1"
|
||||
|
||||
@javascript
|
||||
Scenario: Add a comment with Javascript enabled
|
||||
When I add "I'm a comment from student1" comment to comments block
|
||||
Then I should see "I'm a comment from student1"
|
||||
|
||||
Scenario: Add a comment with Javascript disabled
|
||||
When I follow "Show comments"
|
||||
And I add "I'm a comment from student1" comment to comments block
|
||||
Then I should see "I'm a comment from student1"
|
||||
111
blocks/comments/tests/behat/behat_block_comments.php
Normal file
111
blocks/comments/tests/behat/behat_block_comments.php
Normal file
@ -0,0 +1,111 @@
|
||||
<?php
|
||||
// This file is part of Moodle - http://moodle.org/
|
||||
//
|
||||
// Moodle is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// Moodle is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
/**
|
||||
* Commenting system steps definitions.
|
||||
*
|
||||
* @package core_comment
|
||||
* @category test
|
||||
* @copyright 2013 David Monllaó
|
||||
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
|
||||
*/
|
||||
|
||||
// NOTE: no MOODLE_INTERNAL test here, this file may be required by behat before including /config.php.
|
||||
|
||||
require_once(__DIR__ . '/../../../../lib/behat/behat_base.php');
|
||||
|
||||
use Behat\Mink\Exception\ElementNotFoundException as ElementNotFoundException,
|
||||
Behat\Mink\Exception\ExpectationException as ExpectationException;
|
||||
|
||||
/**
|
||||
* Steps definitions to deal with the commenting system
|
||||
*
|
||||
* @package core_comment
|
||||
* @category test
|
||||
* @copyright 2013 David Monllaó
|
||||
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
|
||||
*/
|
||||
class behat_block_comments extends behat_base {
|
||||
|
||||
/**
|
||||
* Adds the specified option to the comments block of the current page.
|
||||
*
|
||||
* This method can be adapted in future to add other comments considering
|
||||
* that there could be more than one comment textarea per page.
|
||||
*
|
||||
* Only 1 comments block instance is allowed per page, if this changes this
|
||||
* steps definitions should be adapted.
|
||||
*
|
||||
* @Given /^I add "(?P<comment_text_string>(?:[^"]|\\")*)" comment to comments block$/
|
||||
* @throws ElementNotFoundException
|
||||
* @param string $comment
|
||||
*/
|
||||
public function i_add_comment_to_comments_block($comment) {
|
||||
|
||||
// Getting the textarea and setting the provided value.
|
||||
$exception = new ElementNotFoundException($this->getSession(), 'Comments block ');
|
||||
|
||||
// The whole DOM structure changes depending on JS enabled/disabled.
|
||||
if ($this->running_javascript()) {
|
||||
$commentstextarea = $this->find('css', '.comment-area textarea', $exception);
|
||||
$commentstextarea->setValue($comment);
|
||||
|
||||
$this->find_link('Save comment')->click();
|
||||
|
||||
// Wait for the AJAX request.
|
||||
$this->getSession()->wait(4 * 1000, false);
|
||||
|
||||
} else {
|
||||
|
||||
$commentstextarea = $this->find('css', '.block_comments form textarea', $exception);
|
||||
$commentstextarea->setValue($comment);
|
||||
|
||||
// Comments submit button
|
||||
$submit = $this->find('css', '.block_comments form input[type=submit]');
|
||||
$submit->press();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Deletes the specified comment from the current page's comments block.
|
||||
*
|
||||
* @Given /^I delete "(?P<comment_text_string>(?:[^"]|\\")*)" comment from comments block$/
|
||||
* @throws ElementNotFoundException
|
||||
* @throws ExpectationException
|
||||
* @param string $comment
|
||||
*/
|
||||
public function i_delete_comment_from_comments_block($comment) {
|
||||
|
||||
$exception = new ElementNotFoundException($this->getSession(), '"' . $comment . '" comment ');
|
||||
|
||||
$commentxpath = "//div[contains(concat(' ', @class, ' '), ' block_comments ')]
|
||||
/descendant::div[@class='comment-message'][contains(., '" . $comment . "')]";
|
||||
$commentnode = $this->find('xpath', $commentxpath, $exception);
|
||||
|
||||
// Click on delete icon.
|
||||
$deleteexception = new ExpectationException('"' . $comment . '" comment can not be deleted', $this->getSession());
|
||||
$deleteicon = $this->find('css', '.comment-delete a img', $deleteexception, $commentnode);
|
||||
$deleteicon->click();
|
||||
|
||||
// Yes confirm.
|
||||
$confirmnode = $this->find('xpath', "//div[@class='comment-delete-confirm']/descendant::a[contains(., 'Yes')]");
|
||||
$confirmnode->click();
|
||||
|
||||
// Wait for the AJAX request.
|
||||
$this->getSession()->wait(4 * 1000, false);
|
||||
}
|
||||
|
||||
}
|
||||
35
blocks/comments/tests/behat/delete_comment.feature
Normal file
35
blocks/comments/tests/behat/delete_comment.feature
Normal file
@ -0,0 +1,35 @@
|
||||
@core_comment
|
||||
Feature: Delete comment block messages
|
||||
In order to refine comment block's contents
|
||||
As a moodle teacher
|
||||
In need to delete comments from courses
|
||||
|
||||
@javascript
|
||||
Scenario: Delete comments with Javascript enabled
|
||||
Given the following "courses" exists:
|
||||
| fullname | shortname | category |
|
||||
| Course 1 | C1 | 0 |
|
||||
And the following "users" exists:
|
||||
| username | firstname | lastname | email |
|
||||
| teacher1 | Teacher | First | teacher1@asd.com |
|
||||
| student1 | Student | First | student1@asd.com |
|
||||
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 turn editing mode on
|
||||
And I add the "Comments" block
|
||||
And I log out
|
||||
And I log in as "student1"
|
||||
And I follow "Course 1"
|
||||
And I add "Comment from student1" comment to comments block
|
||||
And I log out
|
||||
And I log in as "teacher1"
|
||||
And I follow "Course 1"
|
||||
And I add "Comment from teacher1" comment to comments block
|
||||
When I delete "Comment from student1" comment from comments block
|
||||
Then I should not see "Comment from student1"
|
||||
And I delete "Comment from teacher1" comment from comments block
|
||||
And I should not see "Comment from teacher1"
|
||||
Loading…
x
Reference in New Issue
Block a user