diff options
| author | José Valim <jose.valim@gmail.com> | 2012-04-29 01:13:39 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-04-29 01:13:39 -0700 |
| commit | d4dd1af341dcc1908b594567991845324df0ee56 (patch) | |
| tree | eca4b08b85a15bf6b84f6a4de0093f6c62fd5a70 /actionpack/test/controller | |
| parent | e6ab0d56cf5d376f4b351282c606ecc74e6fad9a (diff) | |
| parent | b4e1903d23a760028d58bc3bb20a1d491bfd4a4b (diff) | |
| download | rails-d4dd1af341dcc1908b594567991845324df0ee56.tar.gz rails-d4dd1af341dcc1908b594567991845324df0ee56.tar.bz2 rails-d4dd1af341dcc1908b594567991845324df0ee56.zip | |
Merge pull request #2321 from omjokine/master
JSONP should use mimetype application/javascript
Diffstat (limited to 'actionpack/test/controller')
| -rw-r--r-- | actionpack/test/controller/render_json_test.rb | 2 |
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 75fed8e933..3be70ab84f 100644 --- a/actionpack/test/controller/render_json_test.rb +++ b/actionpack/test/controller/render_json_test.rb @@ -102,7 +102,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 |