aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/mime_responds_test.rb
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2006-03-12 16:03:44 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2006-03-12 16:03:44 +0000
commitde37f7df4f6bfe369598b2f92b07ce9c2c212e76 (patch)
treec1a4b5833b843580eb87db1221befba0e6ee8e24 /actionpack/test/controller/mime_responds_test.rb
parent3a90c31a566ec3a818e5cc8f0c2dca58ad305c27 (diff)
downloadrails-de37f7df4f6bfe369598b2f92b07ce9c2c212e76.tar.gz
rails-de37f7df4f6bfe369598b2f92b07ce9c2c212e76.tar.bz2
rails-de37f7df4f6bfe369598b2f92b07ce9c2c212e76.zip
Mime types are separated by a comma, not semicolon, in the Accept header. Also switch all internal configuration of mime types away from strings and over to Mime::Type [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3847 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/test/controller/mime_responds_test.rb')
-rw-r--r--actionpack/test/controller/mime_responds_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/controller/mime_responds_test.rb b/actionpack/test/controller/mime_responds_test.rb
index 1470fa9899..159d57f1c3 100644
--- a/actionpack/test/controller/mime_responds_test.rb
+++ b/actionpack/test/controller/mime_responds_test.rb
@@ -111,7 +111,7 @@ class MimeControllerTest < Test::Unit::TestCase
end
def test_js_or_html
- @request.env["HTTP_ACCEPT"] = "text/javascript; text/html"
+ @request.env["HTTP_ACCEPT"] = "text/javascript, text/html"
get :js_or_html
assert_equal 'JS', @response.body
@@ -123,7 +123,7 @@ class MimeControllerTest < Test::Unit::TestCase
end
def test_js_or_anything
- @request.env["HTTP_ACCEPT"] = "text/javascript; */*"
+ @request.env["HTTP_ACCEPT"] = "text/javascript, */*"
get :js_or_html
assert_equal 'JS', @response.body