aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/render_json_test.rb
diff options
context:
space:
mode:
authorOlli Jokinen <olli.jokinen@enemy.fi>2011-07-28 15:39:04 +0300
committerOlli Jokinen <olli.jokinen@enemy.fi>2011-07-28 15:39:04 +0300
commitfae9ad9c712decef70b379f5aa1faa0149902831 (patch)
tree2f4722475425914c5e710fe3a0da35acdd53645f /actionpack/test/controller/render_json_test.rb
parent6b15a45e65addc97bcf30b9d141f97c63df898e8 (diff)
downloadrails-fae9ad9c712decef70b379f5aa1faa0149902831.tar.gz
rails-fae9ad9c712decef70b379f5aa1faa0149902831.tar.bz2
rails-fae9ad9c712decef70b379f5aa1faa0149902831.zip
fixed test case test_render_json_with_callback to use content_type application/javascript
Diffstat (limited to 'actionpack/test/controller/render_json_test.rb')
-rw-r--r--actionpack/test/controller/render_json_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/controller/render_json_test.rb b/actionpack/test/controller/render_json_test.rb
index fc604a2db3..d94fbb9f96 100644
--- a/actionpack/test/controller/render_json_test.rb
+++ b/actionpack/test/controller/render_json_test.rb
@@ -101,7 +101,7 @@ class RenderJsonTest < ActionController::TestCase
def test_render_json_with_callback
get :render_json_hello_world_with_callback
assert_equal 'alert({"hello":"world"})', @response.body
- assert_equal 'application/json', @response.content_type
+ assert_equal 'application/javascript', @response.content_type
end
def test_render_json_with_custom_content_type