diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-01-06 15:18:12 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-01-06 15:50:47 -0800 |
| commit | b15d2c0708b78ee1c8ad6958022214bda18bdbae (patch) | |
| tree | 514d2005aa2c25514b17c40882a5c416025e152f /railties/lib | |
| parent | a58fb105e73837dd9b20a4f2f78ec45d49db4442 (diff) | |
| download | rails-b15d2c0708b78ee1c8ad6958022214bda18bdbae.tar.gz rails-b15d2c0708b78ee1c8ad6958022214bda18bdbae.tar.bz2 rails-b15d2c0708b78ee1c8ad6958022214bda18bdbae.zip | |
require minitest rather than test/unit
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/generators/test_unit/plugin/templates/test_helper.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/test_help.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/test_unit/plugin/templates/test_helper.rb b/railties/lib/rails/generators/test_unit/plugin/templates/test_helper.rb index 2ca36a1e44..e82e321914 100644 --- a/railties/lib/rails/generators/test_unit/plugin/templates/test_helper.rb +++ b/railties/lib/rails/generators/test_unit/plugin/templates/test_helper.rb @@ -1,3 +1,3 @@ require 'rubygems' -require 'test/unit' +require 'minitest/autorun' require 'active_support' diff --git a/railties/lib/rails/test_help.rb b/railties/lib/rails/test_help.rb index 1b5ab549be..156c35b7a4 100644 --- a/railties/lib/rails/test_help.rb +++ b/railties/lib/rails/test_help.rb @@ -2,7 +2,7 @@ # so fixtures aren't loaded into that environment abort("Abort testing: Your Rails environment is running in production mode!") if Rails.env.production? -require 'test/unit' +require 'minitest/autorun' require 'active_support/test_case' require 'action_controller/test_case' require 'action_dispatch/testing/integration' |