From 89de01076aaa35d4cb52ae278dd52c3fa5a2b745 Mon Sep 17 00:00:00 2001
From: Go MAEDA <maeda@farend.jp>
Date: Mon, 1 Jan 2018 10:28:56 +0000
Subject: [PATCH] Replace Minitest.rake_run with
 Rails::TestUnit::Runner.rake_run for compatibility with Rails 5.1.4 (#27871).

Patch by Tatsuya Saito.


git-svn-id: http://svn.redmine.org/redmine/trunk@17139 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/tasks/redmine.rake | 8 ++++----
 lib/tasks/testing.rake | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/tasks/redmine.rake b/lib/tasks/redmine.rake
index 30d5c4c64..f26200114 100644
--- a/lib/tasks/redmine.rake
+++ b/lib/tasks/redmine.rake
@@ -162,25 +162,25 @@ DESC
       desc 'Runs the plugins unit tests.'
       task :units => "db:test:prepare" do |t|
         $: << "test"
-        Minitest.rake_run ["plugins/#{ENV['NAME'] || '*'}/test/unit/**/*_test.rb"]
+        Rails::TestUnit::Runner.rake_run ["plugins/#{ENV['NAME'] || '*'}/test/unit/**/*_test.rb"]
       end
 
       desc 'Runs the plugins functional tests.'
       task :functionals => "db:test:prepare" do |t|
         $: << "test"
-        Minitest.rake_run ["plugins/#{ENV['NAME'] || '*'}/test/functional/**/*_test.rb"]
+        Rails::TestUnit::Runner.rake_run ["plugins/#{ENV['NAME'] || '*'}/test/functional/**/*_test.rb"]
       end
 
       desc 'Runs the plugins integration tests.'
       task :integration => "db:test:prepare" do |t|
         $: << "test"
-        Minitest.rake_run ["plugins/#{ENV['NAME'] || '*'}/test/integration/**/*_test.rb"]
+        Rails::TestUnit::Runner.rake_run ["plugins/#{ENV['NAME'] || '*'}/test/integration/**/*_test.rb"]
       end
 
       desc 'Runs the plugins ui tests.'
       task :ui => "db:test:prepare" do |t|
         $: << "test"
-        Minitest.rake_run ["plugins/#{ENV['NAME'] || '*'}/test/ui/**/*_test.rb"]
+        Rails::TestUnit::Runner.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 fbb25cfd1..33bedd4e0 100644
--- a/lib/tasks/testing.rake
+++ b/lib/tasks/testing.rake
@@ -81,20 +81,20 @@ namespace :test do
 
     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']
+      Rails::TestUnit::Runner.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"
 
     task(:functionals => "db:test:prepare") do |t|
       $: << "test"
-      Minitest.rake_run FileList['test/functional/repositories*_test.rb']
+      Rails::TestUnit::Runner.rake_run FileList['test/functional/repositories*_test.rb']
     end
     Rake::Task['test:scm:functionals'].comment = "Run the scm functional tests"
   end
 
   task(:routing) do |t|
     $: << "test"
-    Minitest.rake_run FileList['test/integration/routing/*_test.rb'] + FileList['test/integration/api_test/*_routing_test.rb']
+    Rails::TestUnit::Runner.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"
 end