aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/mime_responds_test.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2012-01-17 12:00:05 -0800
committerJosé Valim <jose.valim@gmail.com>2012-01-17 12:00:05 -0800
commitba154bd76fb481d9faca123e988924bd864c0318 (patch)
tree89cb9542a0717e52477e6c0ae08fd703ce80dd6d /actionpack/test/controller/mime_responds_test.rb
parent422958f17cbe1b6009313b7acd01cc11aacec3d7 (diff)
parent96a817fb2c5ca32c69469a9d2dc13630d8fa5e8a (diff)
downloadrails-ba154bd76fb481d9faca123e988924bd864c0318.tar.gz
rails-ba154bd76fb481d9faca123e988924bd864c0318.tar.bz2
rails-ba154bd76fb481d9faca123e988924bd864c0318.zip
Merge pull request #4497 from carlosantoniodasilva/action-controller-refactor
Action controller refactor - remove Compatibility module
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