Merged rails-5.1 branch (#23630).

git-svn-id: http://svn.redmine.org/redmine/trunk@16859 e93f8b46-1217-0410-a6f0-8f06a7374b81

1 files changed, 12 insertions, 16 deletions

diff --git a/lib/tasks/redmine.rake b/lib/tasks/redmine.rake
index fa4b02b33..30d5c4c64 100644
--- a/lib/tasks/redmine.rake
+++ b/lib/tasks/redmine.rake
@@ -160,31 +160,27 @@ DESC
 
     namespace :test do
       desc 'Runs the plugins unit tests.'
-      Rake::TestTask.new :units => "db:test:prepare" do |t|
-        t.libs << "test"
-        t.verbose = true
-        t.pattern = "plugins/#{ENV['NAME'] || '*'}/test/unit/**/*_test.rb"
+      task :units => "db:test:prepare" do |t|
+        $: << "test"
+        Minitest.rake_run ["plugins/#{ENV['NAME'] || '*'}/test/unit/**/*_test.rb"]
       end
 
       desc 'Runs the plugins functional tests.'
-      Rake::TestTask.new :functionals => "db:test:prepare" do |t|
-        t.libs << "test"
-        t.verbose = true
-        t.pattern = "plugins/#{ENV['NAME'] || '*'}/test/functional/**/*_test.rb"
+      task :functionals => "db:test:prepare" do |t|
+        $: << "test"
+        Minitest.rake_run ["plugins/#{ENV['NAME'] || '*'}/test/functional/**/*_test.rb"]
       end
 
       desc 'Runs the plugins integration tests.'
-      Rake::TestTask.new :integration => "db:test:prepare" do |t|
-        t.libs << "test"
-        t.verbose = true
-        t.pattern = "plugins/#{ENV['NAME'] || '*'}/test/integration/**/*_test.rb"
+      task :integration => "db:test:prepare" do |t|
+        $: << "test"
+        Minitest.rake_run ["plugins/#{ENV['NAME'] || '*'}/test/integration/**/*_test.rb"]
       end
 
       desc 'Runs the plugins ui tests.'
-      Rake::TestTask.new :ui => "db:test:prepare" do |t|
-        t.libs << "test"
-        t.verbose = true
-        t.pattern = "plugins/#{ENV['NAME'] || '*'}/test/ui/**/*_test.rb"
+      task :ui => "db:test:prepare" do |t|
+        $: << "test"
+        Minitest.rake_run ["plugins/#{ENV['NAME'] || '*'}/test/ui/**/*_test.rb"]
       end
     end
   end