aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorFrancesco Rodriguez <lrodriguezsanc@gmail.com>2012-07-28 13:59:08 -0500
committerFrancesco Rodriguez <lrodriguezsanc@gmail.com>2012-07-28 13:59:08 -0500
commit3326b8b1393489fed9b6717e108bac6a058ff20c (patch)
tree51648a2c30236fc15c86bfed4d52482c769bbdb8 /railties
parentbf1645613e3482040cbc72f0c11aaf9461914cb8 (diff)
downloadrails-3326b8b1393489fed9b6717e108bac6a058ff20c.tar.gz
rails-3326b8b1393489fed9b6717e108bac6a058ff20c.tar.bz2
rails-3326b8b1393489fed9b6717e108bac6a058ff20c.zip
Backport #6995 to 3-2 stable
Update `test_help` to config properly turn natural language option. Last versions of Turn don't monkey patch MiniTest to setup the natural language option. Here is an [example](https://github.com/TwP/turn/blob/master/try/test_autorun_minitest.rb#L3). This patches the following behaviour: $ rake test:units `<top (required)>': undefined method `use_natural_language_case_names=' for MiniTest::Unit:Class (NoMethodError)
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/test_help.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/test_help.rb b/railties/lib/rails/test_help.rb
index 8d0d8cacac..2efa25af7e 100644
--- a/railties/lib/rails/test_help.rb
+++ b/railties/lib/rails/test_help.rb
@@ -17,8 +17,8 @@ if defined?(MiniTest)
begin
require 'turn'
- if MiniTest::Unit.respond_to?(:use_natural_language_case_names=)
- MiniTest::Unit.use_natural_language_case_names = true
+ Turn.config do |c|
+ c.natural = true
end
rescue LoadError
end