diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-01-06 16:43:18 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-01-06 16:43:18 -0800 |
| commit | fec6f1ba82145fe8e9d6258069516d600cc7ce1f (patch) | |
| tree | ab42f4827d7b60d5a24d9462613426d583339f4a /railties/lib/rails | |
| parent | 1c09c29a0958eac86fffede00f30a1bee36d09a9 (diff) | |
| parent | 185aa821d94308171d57e4e2cfffbcc312d01450 (diff) | |
| download | rails-fec6f1ba82145fe8e9d6258069516d600cc7ce1f.tar.gz rails-fec6f1ba82145fe8e9d6258069516d600cc7ce1f.tar.bz2 rails-fec6f1ba82145fe8e9d6258069516d600cc7ce1f.zip | |
Merge pull request #4360 from rafaelfranca/patch-1
Remove more references to Test::Unit
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/test_help.rb | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/railties/lib/rails/test_help.rb b/railties/lib/rails/test_help.rb index 156c35b7a4..4455d92d69 100644 --- a/railties/lib/rails/test_help.rb +++ b/railties/lib/rails/test_help.rb @@ -7,21 +7,14 @@ require 'active_support/test_case' require 'action_controller/test_case' require 'action_dispatch/testing/integration' -if defined?(Test::Unit::Util::BacktraceFilter) && ENV['BACKTRACE'].nil? - require 'rails/backtrace_cleaner' - Test::Unit::Util::BacktraceFilter.module_eval { include Rails::BacktraceFilterForTestUnit } -end - -if defined?(MiniTest) - # Enable turn if it is available - begin - require 'turn' +# Enable turn if it is available +begin + require 'turn' - if MiniTest::Unit.respond_to?(:use_natural_language_case_names=) - MiniTest::Unit.use_natural_language_case_names = true - end - rescue LoadError + if MiniTest::Unit.respond_to?(:use_natural_language_case_names=) + MiniTest::Unit.use_natural_language_case_names = true end +rescue LoadError end if defined?(ActiveRecord::Base) |