aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/test_help.rb
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2011-04-08 09:40:33 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2011-04-08 09:40:33 -0700
commitbd79172e430ffd8c60154d5d98a2d5ea0c93743b (patch)
tree6861b21f5ed4f4e6139254145f1af178165b8fe7 /railties/lib/rails/test_help.rb
parent2cdc1f0cd5b89722e8c22bb4b26b83bd4619b28a (diff)
downloadrails-bd79172e430ffd8c60154d5d98a2d5ea0c93743b.tar.gz
rails-bd79172e430ffd8c60154d5d98a2d5ea0c93743b.tar.bz2
rails-bd79172e430ffd8c60154d5d98a2d5ea0c93743b.zip
make turn a soft dependency. generate a Gemfile that contains turn and require turn if it is available
Diffstat (limited to 'railties/lib/rails/test_help.rb')
-rw-r--r--railties/lib/rails/test_help.rb10
1 files changed, 7 insertions, 3 deletions
diff --git a/railties/lib/rails/test_help.rb b/railties/lib/rails/test_help.rb
index b9f7bdc2eb..41485c8bac 100644
--- a/railties/lib/rails/test_help.rb
+++ b/railties/lib/rails/test_help.rb
@@ -14,10 +14,14 @@ if defined?(Test::Unit::Util::BacktraceFilter) && ENV['BACKTRACE'].nil?
end
if defined?(MiniTest)
- 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
+ if MiniTest::Unit.respond_to?(:use_natural_language_case_names=)
+ MiniTest::Unit.use_natural_language_case_names = true
+ end
+ rescue LoadError
end
end