Moved Turn activation/dependency to railties

activesupport/CHANGELOG

@@ -1,7 +1,5 @@
 *Rails 3.1.0 (unreleased)*
 
-* Add using Turn with natural language test case names if the library is available (which it will be in Rails 3.1) [DHH]
-
 * LocalCache strategy is now a real middleware class, not an anonymous class
 posing for pictures.
 

activesupport/lib/active_support/test_case.rb

@@ -5,7 +5,6 @@
 require 'active_support/testing/declarative'
 require 'active_support/testing/pending'
 require 'active_support/testing/isolation'
-require 'active_support/testing/turn_formatting'
 require 'active_support/testing/mochaing'
 require 'active_support/core_ext/kernel/reporting'
 

rails.gemspec

@@ -25,6 +25,5 @@ Gem::Specification.new do |s|
   s.add_dependency('activeresource', version)
   s.add_dependency('actionmailer',   version)
   s.add_dependency('railties',       version)
-  s.add_dependency('turn',           '~> 0.8.2')
   s.add_dependency('bundler',        '~> 1.0')
 end

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]

railties/lib/rails/commands/console.rb

@@ -36,7 +36,7 @@ def start
       end
 
       if defined?(ActiveRecord)
-        ActiveRecord::Base.logger = Logger.new(STDOUT)
+        ActiveRecord::Base.logger = Logger.new(STDERR)
       end
 
       if options[:sandbox]

railties/lib/rails/test_help.rb

@@ -13,6 +13,14 @@
   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'
 

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