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 /actionpack | |
| 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 'actionpack')
| -rw-r--r-- | actionpack/test/abstract_unit.rb | 2 | ||||
| -rw-r--r-- | actionpack/test/dispatch/routing/inspector_test.rb | 2 | ||||
| -rw-r--r-- | actionpack/test/ts_isolated.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb index 95bff0a204..bbcd289886 100644 --- a/actionpack/test/abstract_unit.rb +++ b/actionpack/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 'abstract_controller' require 'action_controller' require 'action_view' diff --git a/actionpack/test/dispatch/routing/inspector_test.rb b/actionpack/test/dispatch/routing/inspector_test.rb index a3034ce001..c058bd4909 100644 --- a/actionpack/test/dispatch/routing/inspector_test.rb +++ b/actionpack/test/dispatch/routing/inspector_test.rb @@ -1,4 +1,4 @@ -require 'minitest/autorun' +require 'active_support/testing/autorun' require 'action_controller' require 'rails/engine' require 'action_dispatch/routing/inspector' diff --git a/actionpack/test/ts_isolated.rb b/actionpack/test/ts_isolated.rb index c44c5d8968..55620abe84 100644 --- a/actionpack/test/ts_isolated.rb +++ b/actionpack/test/ts_isolated.rb @@ -1,4 +1,4 @@ -require 'minitest/autorun' +require 'active_support/testing/autorun' require 'rbconfig' require 'abstract_unit' |