diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2010-02-14 19:28:05 +0000 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2010-02-14 19:28:05 +0000 |
| commit | 6f3c5f67870a625b8be4de6e34e8d0d2f5d2b5e3 (patch) | |
| tree | 3da8d75101aabe3c1d90d0582505ec1480c9d885 /railties/lib/rails/test_help.rb | |
| parent | 77bf78b3b78a41d4f2f6e733f5c9c00608c0adba (diff) | |
| parent | a1b60696e2b13cbe94d748444cc0da37b190fbb8 (diff) | |
| download | rails-6f3c5f67870a625b8be4de6e34e8d0d2f5d2b5e3.tar.gz rails-6f3c5f67870a625b8be4de6e34e8d0d2f5d2b5e3.tar.bz2 rails-6f3c5f67870a625b8be4de6e34e8d0d2f5d2b5e3.zip | |
Merge remote branch 'mainstream/master'
Conflicts:
railties/README
railties/guides/source/active_support_core_extensions.textile
railties/guides/source/getting_started.textile
railties/lib/generators/rails/app/templates/README
Diffstat (limited to 'railties/lib/rails/test_help.rb')
| -rw-r--r-- | railties/lib/rails/test_help.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/railties/lib/rails/test_help.rb b/railties/lib/rails/test_help.rb index 350d0b3961..f9aa018cab 100644 --- a/railties/lib/rails/test_help.rb +++ b/railties/lib/rails/test_help.rb @@ -5,6 +5,12 @@ exit("Abort testing: Your Rails environment is not running in test mode!") unles require 'test/unit' require 'active_support/core_ext/kernel/requires' +# TODO: Figure out how to get the Rails::BacktraceFilter into minitest/unit +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?(ActiveRecord) class ActiveSupport::TestCase include ActiveRecord::TestFixtures |