aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/deprecation/deprecated_base_methods_test.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-05-04 08:35:35 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2009-05-04 08:35:35 -0700
commit8b6d2ef2f562c34ebc2ef547b0a18c31f5820569 (patch)
treeb1397a8374b465ea2f300e776de126bb88386bcc /actionpack/test/controller/deprecation/deprecated_base_methods_test.rb
parentd3ee8756c8b09b8524a9599926b02ededd27319c (diff)
parentbcc4537f2a0d37fc02d67e9564fa5c9c5555b3d5 (diff)
downloadrails-8b6d2ef2f562c34ebc2ef547b0a18c31f5820569.tar.gz
rails-8b6d2ef2f562c34ebc2ef547b0a18c31f5820569.tar.bz2
rails-8b6d2ef2f562c34ebc2ef547b0a18c31f5820569.zip
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/test/controller/deprecation/deprecated_base_methods_test.rb')
-rw-r--r--actionpack/test/controller/deprecation/deprecated_base_methods_test.rb6
1 files changed, 0 insertions, 6 deletions
diff --git a/actionpack/test/controller/deprecation/deprecated_base_methods_test.rb b/actionpack/test/controller/deprecation/deprecated_base_methods_test.rb
index dd69a63020..0c02afea36 100644
--- a/actionpack/test/controller/deprecation/deprecated_base_methods_test.rb
+++ b/actionpack/test/controller/deprecation/deprecated_base_methods_test.rb
@@ -15,12 +15,6 @@ class DeprecatedBaseMethodsTest < ActionController::TestCase
tests Target
- def test_log_error_silences_deprecation_warnings
- get :raises_name_error
- rescue => e
- assert_not_deprecated { @controller.send :log_error, e }
- end
-
if defined? Test::Unit::Error
def test_assertion_failed_error_silences_deprecation_warnings
get :raises_name_error