Merged updates from trunk into stable branch

[feedcatcher.git] / vendor / rails / actionpack / test / controller / deprecation / deprecated_base_methods_test.rb

diff --git a/vendor/rails/actionpack/test/controller/deprecation/deprecated_base_methods_test.rb b/vendor/rails/actionpack/test/controller/deprecation/deprecated_base_methods_test.rb
new file mode 100644 (file)
index 0000000..dd69a63
--- /dev/null
+++ b/vendor/rails/actionpack/test/controller/deprecation/deprecated_base_methods_test.rb
@@ -0,0 +1,32 @@
+require 'abstract_unit'
+
+class DeprecatedBaseMethodsTest < ActionController::TestCase
+  class Target < ActionController::Base
+    def home_url(greeting)
+      "http://example.com/#{greeting}"
+    end
+
+    def raises_name_error
+      this_method_doesnt_exist
+    end
+
+    def rescue_action(e) raise e end
+  end
+
+  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
+    rescue => e
+      error = Test::Unit::Error.new('testing ur doodz', e)
+      assert_not_deprecated { error.message }
+    end
+  end
+end