From c4df67dcaf19b93a7fcff7e0fd292f0a5e44e42f Mon Sep 17 00:00:00 2001
From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Mon, 30 Sep 2019 12:47:52 +0000
Subject: [PATCH] fix duplicate name of
 IssuesControllerTest#test_bulk_copy_should_allow_copying_the_subtasks

git-svn-id: http://svn.redmine.org/redmine/trunk@18569 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 .rubocop_todo.yml                         | 1 -
 test/functional/issues_controller_test.rb | 6 ++----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 7f189a081..133143fd5 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -505,7 +505,6 @@ Lint/DuplicateMethods:
     - 'app/models/custom_field_value.rb'
     - 'app/models/query.rb'
     - 'app/models/wiki_page.rb'
-    - 'test/functional/issues_controller_test.rb'
 
 Lint/EmptyWhen:
   Exclude:
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index b9ef3bb27..adbe6b794 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -6585,7 +6585,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
@@ -6605,10 +6605,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],
@@ -6616,7 +6615,6 @@ class IssuesControllerTest < Redmine::ControllerTest
           :copy_watchers => '1',
           :issue => {
             :project_id => ''
-
           }
         }
     end