aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/mime_responds_test.rb
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-01-14 18:28:09 -0200
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-01-17 10:04:37 -0200
commit71566c357308da8ab3fa86794ef57b853f99ce63 (patch)
tree8afe3039c845821454334dd106373ce165425fff /actionpack/test/controller/mime_responds_test.rb
parent1ae9e60b8a369f004d001e885ca71cb0ade2be80 (diff)
downloadrails-71566c357308da8ab3fa86794ef57b853f99ce63.tar.gz
rails-71566c357308da8ab3fa86794ef57b853f99ce63.tar.bz2
rails-71566c357308da8ab3fa86794ef57b853f99ce63.zip
Remove rescue_action from compatibility module and tests
Diffstat (limited to 'actionpack/test/controller/mime_responds_test.rb')
-rw-r--r--actionpack/test/controller/mime_responds_test.rb6
1 files changed, 1 insertions, 5 deletions
diff --git a/actionpack/test/controller/mime_responds_test.rb b/actionpack/test/controller/mime_responds_test.rb
index 76a8c89e60..60498822ff 100644
--- a/actionpack/test/controller/mime_responds_test.rb
+++ b/actionpack/test/controller/mime_responds_test.rb
@@ -151,10 +151,6 @@ class RespondToController < ActionController::Base
end
end
- def rescue_action(e)
- raise
- end
-
protected
def set_layout
if action_name.in?(["all_types_with_layout", "iphone_with_html_response_type"])
@@ -498,7 +494,7 @@ class RespondToControllerTest < ActionController::TestCase
assert_equal '<html><div id="iphone">Hello iPhone future from iPhone!</div></html>', @response.body
assert_equal "text/html", @response.content_type
end
-
+
def test_invalid_format
get :using_defaults, :format => "invalidformat"
assert_equal " ", @response.body