diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-01-07 20:19:21 -0800 |
|---|---|---|
| committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-01-07 20:19:21 -0800 |
| commit | 4200614b2ac2fc129fbeb3b1c8d484c8c7b8488c (patch) | |
| tree | edb7634e0e2786dc9246ef97efcde5e4ba9d6840 | |
| parent | cb3181e81e3a0e9d03450c7065fcc226e2e1731c (diff) | |
| parent | bc95767b149670b2e761427506c3084c3682b6f7 (diff) | |
| download | rails-4200614b2ac2fc129fbeb3b1c8d484c8c7b8488c.tar.gz rails-4200614b2ac2fc129fbeb3b1c8d484c8c7b8488c.tar.bz2 rails-4200614b2ac2fc129fbeb3b1c8d484c8c7b8488c.zip | |
Merge pull request #8801 from ktheory/dont_require_turn
Don't require 'turn' from rails/test_help
| -rw-r--r-- | railties/lib/rails/test_help.rb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/railties/lib/rails/test_help.rb b/railties/lib/rails/test_help.rb index 616206dd0b..1894ed7cdc 100644 --- a/railties/lib/rails/test_help.rb +++ b/railties/lib/rails/test_help.rb @@ -11,14 +11,11 @@ require 'action_dispatch/testing/integration' 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) |