aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/mime_responds_test.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-05-26 02:29:23 -0700
committerJosé Valim <jose.valim@gmail.com>2011-05-26 02:29:23 -0700
commitec08bfc035e792d973152902563fb5dad82c437c (patch)
treeef12227ce4ab593194a91d60f15a8b6eb77de1af /actionpack/test/controller/mime_responds_test.rb
parentbadc72f3e645b4176b04a4f5181a7f8a04a32f09 (diff)
parent16571f9c42e2717eeb8bf7c915911fa1ca714525 (diff)
downloadrails-ec08bfc035e792d973152902563fb5dad82c437c.tar.gz
rails-ec08bfc035e792d973152902563fb5dad82c437c.tar.bz2
rails-ec08bfc035e792d973152902563fb5dad82c437c.zip
Merge pull request #1324 from dmathieu/no_error_on_invalid_format
Don't raise an exception if the format isn't recognized
Diffstat (limited to 'actionpack/test/controller/mime_responds_test.rb')
-rw-r--r--actionpack/test/controller/mime_responds_test.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/actionpack/test/controller/mime_responds_test.rb b/actionpack/test/controller/mime_responds_test.rb
index 4a5e597500..26270571cf 100644
--- a/actionpack/test/controller/mime_responds_test.rb
+++ b/actionpack/test/controller/mime_responds_test.rb
@@ -498,6 +498,12 @@ 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
+ assert_equal "text/html", @response.content_type
+ end
end
class RespondWithController < ActionController::Base