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

Merge branch 'MDL-52063-29' of git://github.com/xow/moodle into MOODLE_29_STABLE

Browse Source
This commit is contained in:
Dan Poltawski
2015-11-10 09:28:32 +00:00
parent 12c17ffaee 5821639bb7
commit 7e0516eab3
2 changed files with 40 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/forum/discuss.php
+1 -1
View File
@@ -169,7 +169,7 @@ if ($move > 0 and confirm_sesskey()) {
forum_rss_delete_file($forum);
forum_rss_delete_file($forumto);
redirect($return.'&moved=-1&sesskey='.sesskey());
redirect($return.'&move=-1&sesskey='.sesskey());
}
// Trigger discussion viewed event.
mod/forum/tests/behat/move_discussion.feature
+39
View File
@@ -0,0 +1,39 @@
@mod @mod_forum
Feature: A teacher can move discussions between forums
In order to move a discussion
As a teacher
I need to use the move discussion selector
Background:
Given the following "users" exist:
| username | firstname | lastname | email |
| teacher1 | Teacher | 1 | teacher1@example.com |
| student1 | Student | 1 | student1@example.com |
And the following "courses" exist:
| fullname | shortname | category |
| Course 1 | C1 | 0 |
And the following "course enrolments" exist:
| user | course | role |
| teacher1 | C1 | editingteacher |
| student1 | C1 | student |
Scenario: A teacher can move discussions
Given the following "activities" exist:
| activity | name | intro | course | idnumber | groupmode |
| forum | Test forum 1 | Test forum 2 | C1 | forum | 0 |
| forum | Test forum 2 | Test forum 1 | C1 | forum | 0 |
And I log in as "student1"
And I follow "Course 1"
And I follow "Test forum 1"
And I add a new discussion to "Test forum 1" forum with:
| Subject | Discussion 1 |
| Message | Test post message |
And I wait "1" seconds
And I log out
And I log in as "teacher1"
And I follow "Course 1"
And I follow "Test forum 1"
And I follow "Discussion 1"
When I set the field "jump" to "Test forum 2"
And I press "Move"
Then I should see "This discussion has been moved to 'Test forum 2'."