aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/minitest
diff options
context:
space:
mode:
authoryuuji.yaginuma <yuuji.yaginuma@gmail.com>2018-04-11 07:20:53 +0900
committeryuuji.yaginuma <yuuji.yaginuma@gmail.com>2018-04-11 07:20:53 +0900
commit686f4f3a9432458370596d8de2a2bdc1f727cc23 (patch)
treec19022fa5c98cb24872ba3adbeefd4e3f40a7fc1 /railties/lib/minitest
parent72f17d59e40c95d08edb893b898145a7bf68d1a2 (diff)
downloadrails-686f4f3a9432458370596d8de2a2bdc1f727cc23.tar.gz
rails-686f4f3a9432458370596d8de2a2bdc1f727cc23.tar.bz2
rails-686f4f3a9432458370596d8de2a2bdc1f727cc23.zip
Allow use of minitest-rails gem with Rails test runner
Add explicit global namespace to `Rails::TestUnit::Runner` to resolve a namespace conflict between `minitest-rails` and Rails test runner. Fixes #31324
Diffstat (limited to 'railties/lib/minitest')
-rw-r--r--railties/lib/minitest/rails_plugin.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/minitest/rails_plugin.rb b/railties/lib/minitest/rails_plugin.rb
index 7193abbc33..6486fa1798 100644
--- a/railties/lib/minitest/rails_plugin.rb
+++ b/railties/lib/minitest/rails_plugin.rb
@@ -13,7 +13,7 @@ module Minitest
end
def self.plugin_rails_options(opts, options)
- Rails::TestUnit::Runner.attach_before_load_options(opts)
+ ::Rails::TestUnit::Runner.attach_before_load_options(opts)
opts.on("-b", "--backtrace", "Show the complete backtrace") do
options[:full_backtrace] = true