Moved Turn activation/dependency to railties

4 files changed, 12 insertions, 1 deletions

diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index 07e7e461de..f159247308 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
 *Rails 3.1.0 (unreleased)*
 
+* Add using Turn with natural language test case names for test_help.rb when running with minitest (Ruby 1.9.2+) [DHH]
+
 * Direct logging of Active Record to STDOUT so it's shown inline with the results in the console [DHH]
 
 * Added `config.force_ssl` configuration which loads Rack::SSL middleware and force all requests to be under HTTPS protocol [DHH, Prem Sichanugrist, and Josh Peek]
diff --git a/railties/lib/rails/commands/console.rb b/railties/lib/rails/commands/console.rb
index 2a6cdca440..2b7faf9715 100644
--- a/railties/lib/rails/commands/console.rb
+++ b/railties/lib/rails/commands/console.rb
@@ -36,7 +36,7 @@ module Rails
       end
       
       if defined?(ActiveRecord)
-        ActiveRecord::Base.logger = Logger.new(STDOUT)
+        ActiveRecord::Base.logger = Logger.new(STDERR)
       end
 
       if options[:sandbox]
diff --git a/railties/lib/rails/test_help.rb b/railties/lib/rails/test_help.rb
index 00029e627e..b9f7bdc2eb 100644
--- a/railties/lib/rails/test_help.rb
+++ b/railties/lib/rails/test_help.rb
@@ -13,6 +13,14 @@ if defined?(Test::Unit::Util::BacktraceFilter) && ENV['BACKTRACE'].nil?
   Test::Unit::Util::BacktraceFilter.module_eval { include Rails::BacktraceFilterForTestUnit }
 end
 
+if defined?(MiniTest)
+  require 'turn'
+
+  if MiniTest::Unit.respond_to?(:use_natural_language_case_names=)
+    MiniTest::Unit.use_natural_language_case_names = true 
+  end
+end
+
 if defined?(ActiveRecord)
   require 'active_record/test_case'
 
diff --git a/railties/railties.gemspec b/railties/railties.gemspec
index c51fe856be..1e233c885e 100644
--- a/railties/railties.gemspec
+++ b/railties/railties.gemspec
@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
   s.add_dependency('rake',          '>= 0.8.7')
   s.add_dependency('thor',          '~> 0.14.4')
   s.add_dependency('rack-ssl',      '~> 1.3.2')
+  s.add_dependency('turn',          '~> 0.8.2')
   s.add_dependency('activesupport', version)
   s.add_dependency('actionpack',    version)
 end