aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-01-06 15:54:40 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-01-06 20:43:04 -0300
commitce84df020a9665348912b42661c906a332d55220 (patch)
tree6a1071844ef800be08d1c7cf1aea27814d9145fa
parentf9382cd7948c75a9ca0772ee2795699577b06d47 (diff)
downloadrails-ce84df020a9665348912b42661c906a332d55220.tar.gz
rails-ce84df020a9665348912b42661c906a332d55220.tar.bz2
rails-ce84df020a9665348912b42661c906a332d55220.zip
MiniTest is always defined in this case
-rw-r--r--railties/lib/rails/test_help.rb14
1 files changed, 6 insertions, 8 deletions
diff --git a/railties/lib/rails/test_help.rb b/railties/lib/rails/test_help.rb
index 0b2842837f..87326e47a1 100644
--- a/railties/lib/rails/test_help.rb
+++ b/railties/lib/rails/test_help.rb
@@ -7,16 +7,14 @@ require 'active_support/test_case'
require 'action_controller/test_case'
require 'action_dispatch/testing/integration'
-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)