diff options
| author | José Valim <jose.valim@gmail.com> | 2012-04-29 08:39:13 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-04-29 08:39:13 -0700 |
| commit | 8c2cf1ad1bbb63cab4b503724465d70154f6aab0 (patch) | |
| tree | 2637d7072d1bac38745d46bd7ed0ee0ebb5e6568 /actionpack/test | |
| parent | 6bea191a750db805aefa82339074fe61637e8fb1 (diff) | |
| parent | 65df4c53c2f6055618cd23c8a399074a4c5bffe2 (diff) | |
| download | rails-8c2cf1ad1bbb63cab4b503724465d70154f6aab0.tar.gz rails-8c2cf1ad1bbb63cab4b503724465d70154f6aab0.tar.bz2 rails-8c2cf1ad1bbb63cab4b503724465d70154f6aab0.zip | |
Merge pull request #6047 from carlosantoniodasilva/changelog-jsonp-mimetype
Add changelog entry for jsonp mimetype change, fix failing test
Diffstat (limited to 'actionpack/test')
| -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 3be70ab84f..7c0a6bd67e 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/javascript', @response.content_type + assert_equal 'text/javascript', @response.content_type end def test_render_json_with_custom_content_type |