Merged r18569 from trunk to 4.0-stable

fix duplicate name of IssuesControllerTest#test_bulk_copy_should_allow_copying_the_subtasks

git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18574 e93f8b46-1217-0410-a6f0-8f06a7374b81

test/functional/issues_controller_test.rb

@@ -6277,7 +6277,7 @@ class IssuesControllerTest < Redmine::ControllerTest
     end
   end
 
-  def test_bulk_copy_should_allow_copying_the_subtasks
+  test "bulk copy should allow copying the subtasks" do
     issue = Issue.generate_with_descendants!
     count = issue.descendants.count
     @request.session[:user_id] = 2
@@ -6297,10 +6297,9 @@ class IssuesControllerTest < Redmine::ControllerTest
     assert_equal count, copy.descendants.count
   end
 
-  def test_bulk_copy_should_allow_copying_the_subtasks
+  test "issue bulk copy copy watcher" do
     Watcher.create!(:watchable => Issue.find(1), :user => User.find(3))
     @request.session[:user_id] = 2
-
     assert_difference 'Issue.count' do
       post :bulk_update, :params => {
           :ids => [1],
@@ -6308,7 +6307,6 @@ class IssuesControllerTest < Redmine::ControllerTest
           :copy_watchers => '1',
           :issue => {
             :project_id => ''
-
           }
         }
     end