From 6ccbeb458a5698db6242d7bd326ef9d9bd23c7b6 Mon Sep 17 00:00:00 2001 From: Yves Senn Date: Fri, 30 Jan 2015 16:19:37 +0100 Subject: move `ENV["BACKTRACE"]` support into the TestRunner. --- railties/lib/rails/test_unit/minitest_plugin.rb | 3 +-- railties/lib/rails/test_unit/runner.rb | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'railties/lib/rails') diff --git a/railties/lib/rails/test_unit/minitest_plugin.rb b/railties/lib/rails/test_unit/minitest_plugin.rb index 149aad372c..70ce9d3360 100644 --- a/railties/lib/rails/test_unit/minitest_plugin.rb +++ b/railties/lib/rails/test_unit/minitest_plugin.rb @@ -7,9 +7,8 @@ def Minitest.plugin_rails_init(options) options[:filter] = method end - if ENV["BACKTRACE"].nil? && !($rails_test_runner && $rails_test_runner.show_backtrace?) + if !($rails_test_runner && $rails_test_runner.show_backtrace?) Minitest.backtrace_filter = Rails.backtrace_cleaner end end Minitest.extensions << 'rails' - diff --git a/railties/lib/rails/test_unit/runner.rb b/railties/lib/rails/test_unit/runner.rb index 5a1b98d534..aec4707947 100644 --- a/railties/lib/rails/test_unit/runner.rb +++ b/railties/lib/rails/test_unit/runner.rb @@ -7,7 +7,7 @@ module Rails class TestRunner class Options def self.parse(args) - options = { backtrace: false, name: nil, environment: "test" } + options = { backtrace: !ENV["BACKTRACE"].nil?, name: nil, environment: "test" } opt_parser = ::OptionParser.new do |opts| opts.banner = "Usage: bin/rails test [options] [file or directory]" -- cgit v1.2.3