Permalink
Browse files

Merge pull request #8801 from ktheory/dont_require_turn

Don't require 'turn' from rails/test_help
  • Loading branch information...
2 parents cb3181e + bc95767 commit 4200614b2ac2fc129fbeb3b1c8d484c8c7b8488c @guilleiguaran guilleiguaran committed Jan 8, 2013
Showing with 2 additions and 5 deletions.
  1. +2 −5 railties/lib/rails/test_help.rb
@@ -11,14 +11,11 @@
require 'rails/backtrace_cleaner'
MiniTest.backtrace_filter = Rails.backtrace_cleaner
-# Enable turn if it is available
-begin
- require 'turn'
-
+# Configure turn if it is available
+if defined?(Turn)
Turn.config do |c|
c.natural = true
end
-rescue LoadError
end
if defined?(ActiveRecord::Base)

0 comments on commit 4200614

Please sign in to comment.