From 5821639bb786fd380f3eab389f87d8fe973dc259 Mon Sep 17 00:00:00 2001
From: John Okely <john@moodle.com>
Date: Mon, 9 Nov 2015 14:37:45 +0800
Subject: [PATCH] MDL-52063 forum: Display message when moving forum

---
 mod/forum/discuss.php                         |  2 +-
 mod/forum/tests/behat/move_discussion.feature | 39 +++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 mod/forum/tests/behat/move_discussion.feature

diff --git a/mod/forum/discuss.php b/mod/forum/discuss.php
index a99fae57236..64e3a405a3d 100644
--- a/mod/forum/discuss.php
+++ b/mod/forum/discuss.php
@@ -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.
diff --git a/mod/forum/tests/behat/move_discussion.feature b/mod/forum/tests/behat/move_discussion.feature
new file mode 100644
index 00000000000..fb025d14222
--- /dev/null
+++ b/mod/forum/tests/behat/move_discussion.feature
@@ -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'."