Merged rails-5.1 branch (#23630).

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

2 files changed, 24 insertions, 34 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
diff --git a/lib/tasks/testing.rake b/lib/tasks/testing.rake
index 831f4d316..47364c82c 100644
--- a/lib/tasks/testing.rake
+++ b/lib/tasks/testing.rake
@@ -79,34 +79,28 @@ namespace :test do
       end
     end
 
-    Rake::TestTask.new(:units => "db:test:prepare") do |t|
-      t.libs << "test"
-      t.verbose = true
-      t.warning = false
-      t.test_files = FileList['test/unit/repository*_test.rb'] + FileList['test/unit/lib/redmine/scm/**/*_test.rb']
+    task(:units => "db:test:prepare") do |t|
+      $: << "test"
+      Minitest.rake_run FileList['test/unit/repository*_test.rb'] + FileList['test/unit/lib/redmine/scm/**/*_test.rb']
     end
     Rake::Task['test:scm:units'].comment = "Run the scm unit tests"
 
-    Rake::TestTask.new(:functionals => "db:test:prepare") do |t|
-      t.libs << "test"
-      t.verbose = true
-      t.warning = false
-      t.test_files = FileList['test/functional/repositories*_test.rb']
+    task(:functionals => "db:test:prepare") do |t|
+      $: << "test"
+      Minitest.rake_run FileList['test/functional/repositories*_test.rb']
     end
     Rake::Task['test:scm:functionals'].comment = "Run the scm functional tests"
   end
 
-  Rake::TestTask.new(:routing) do |t|
-    t.libs << "test"
-    t.verbose = true
-    t.test_files = FileList['test/integration/routing/*_test.rb'] + FileList['test/integration/api_test/*_routing_test.rb']
+  task(:routing) do |t|
+    $: << "test"
+    Minitest.rake_run FileList['test/integration/routing/*_test.rb'] + FileList['test/integration/api_test/*_routing_test.rb']
   end
   Rake::Task['test:routing'].comment = "Run the routing tests"
 
-  Rake::TestTask.new(:ui => "db:test:prepare") do |t|
-    t.libs << "test"
-    t.verbose = true
-    t.test_files = FileList['test/ui/**/*_test_ui.rb']
+  task(:ui => "db:test:prepare") do |t|
+    $: << "test"
+    Minitest.rake_run FileList['test/ui/**/*_test_ui.rb']
   end
   Rake::Task['test:ui'].comment = "Run the UI tests with Capybara (PhantomJS listening on port 4444 is required)"
 end