diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-12-28 16:17:37 -0300 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-12-31 13:57:24 -0300 |
commit | 5da4d5142a60edda0cb78071553993ee33bb8637 (patch) | |
tree | 7c9f025bb50cd918c176a429749d221caa27802e /activesupport/test | |
parent | eb4930e3c724cf71d6ce5bb2aec4af82b2025b03 (diff) | |
download | rails-5da4d5142a60edda0cb78071553993ee33bb8637.tar.gz rails-5da4d5142a60edda0cb78071553993ee33bb8637.tar.bz2 rails-5da4d5142a60edda0cb78071553993ee33bb8637.zip |
Add active_support/testing/autorun
minitest/autorun load minitest/spec polluting the global namespace with
the DSL that we don't want on Rails
Diffstat (limited to 'activesupport/test')
-rw-r--r-- | activesupport/test/abstract_unit.rb | 2 | ||||
-rw-r--r-- | activesupport/test/ts_isolated.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/test/abstract_unit.rb b/activesupport/test/abstract_unit.rb index 8a67b148c3..90e50f235b 100644 --- a/activesupport/test/abstract_unit.rb +++ b/activesupport/test/abstract_unit.rb @@ -15,7 +15,7 @@ silence_warnings do Encoding.default_external = "UTF-8" end -require 'minitest/autorun' +require 'active_support/testing/autorun' require 'empty_bool' ENV['NO_RELOAD'] = '1' diff --git a/activesupport/test/ts_isolated.rb b/activesupport/test/ts_isolated.rb index 2c217157d3..294d6595f7 100644 --- a/activesupport/test/ts_isolated.rb +++ b/activesupport/test/ts_isolated.rb @@ -1,4 +1,4 @@ -require 'minitest/autorun' +require 'active_support/testing/autorun' require 'active_support/test_case' require 'rbconfig' require 'active_support/core_ext/kernel/reporting' |