aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2013-06-25 19:34:20 -0300
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2013-06-25 19:34:20 -0300
commitdd9d8697466f111299fd9b7cf1cf565f20951e15 (patch)
tree28940f6763c52b757e236174f7500b411751e366 /actionpack/test/controller
parentf02d4ddc99ad70d1bd50ff70d37aed5f9cf49398 (diff)
parent8ffd139edd062fe3e888895d4af80730a0798758 (diff)
downloadrails-dd9d8697466f111299fd9b7cf1cf565f20951e15.tar.gz
rails-dd9d8697466f111299fd9b7cf1cf565f20951e15.tar.bz2
rails-dd9d8697466f111299fd9b7cf1cf565f20951e15.zip
Merge pull request #11000 from sbeckeriv/accept_header
Fix undefined method `ref' for nil:NilClass for bad accept headers
Diffstat (limited to 'actionpack/test/controller')
-rw-r--r--actionpack/test/controller/render_test.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index 72411ec900..fd835795c0 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -1089,6 +1089,12 @@ class RenderTest < ActionController::TestCase
assert_equal '<test>passed formatted html erb</test>', @response.body
end
+ def test_should_render_formatted_html_erb_template_with_bad_accepts_header
+ @request.env["HTTP_ACCEPT"] = "; a=dsf"
+ get :formatted_xml_erb
+ assert_equal '<test>passed formatted html erb</test>', @response.body
+ end
+
def test_should_render_formatted_html_erb_template_with_faulty_accepts_header
@request.accept = "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, appliction/x-shockwave-flash, */*"
get :formatted_xml_erb