aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/CHANGELOG2
-rw-r--r--activesupport/lib/active_support/test_case.rb1
-rw-r--r--activesupport/lib/active_support/testing/turn_formatting.rb33
3 files changed, 0 insertions, 36 deletions
diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG
index 1be5f39ac4..373236ce9a 100644
--- a/activesupport/CHANGELOG
+++ b/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.
diff --git a/activesupport/lib/active_support/test_case.rb b/activesupport/lib/active_support/test_case.rb
index 7ac9ad46e9..8d6c27e381 100644
--- a/activesupport/lib/active_support/test_case.rb
+++ b/activesupport/lib/active_support/test_case.rb
@@ -5,7 +5,6 @@ require 'active_support/testing/deprecation'
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'
diff --git a/activesupport/lib/active_support/testing/turn_formatting.rb b/activesupport/lib/active_support/testing/turn_formatting.rb
deleted file mode 100644
index ed9381e298..0000000000
--- a/activesupport/lib/active_support/testing/turn_formatting.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-# Turn gives you prettier formatting for MiniTest and inline failure reporting.
-# It also allows us to report test cases in natural language rather than with underscores. Example:
-#
-# CommentsControllerTest:
-# PASS the truth (0.03s)
-#
-# APITest
-# test_api_without_subdomain PASS
-# test_create_milestone_using_typed_xml FAIL
-# /test/integration/api_test.rb:50:in `test_create_milestone_using_typed_xml'
-# <2006-05-01> expected but was
-# <Mon May 01 07:00:00 UTC 2006>.
-# test_create_milestone_using_untyped_xml FAIL
-# /test/integration/api_test.rb:38:in `test_create_milestone_using_untyped_xml'
-# <2006-05-01> expected but was
-# <Mon May 01 07:00:00 UTC 2006>.
-
-#
-# vs:
-#
-# .FF
-
-if defined?(MiniTest)
- begin
- silence_warnings { require 'turn' }
-
- if MiniTest::Unit.respond_to?(:use_natural_language_case_names=)
- MiniTest::Unit.use_natural_language_case_names = true
- end
- rescue LoadError
- # If there's no turn, that's fine, it's just formatting
- end
-end \ No newline at end of file