From 65df4c53c2f6055618cd23c8a399074a4c5bffe2 Mon Sep 17 00:00:00 2001 From: Carlos Antonio da Silva Date: Sun, 29 Apr 2012 11:55:35 -0300 Subject: Add changelog entry for jsonp mimetype change, fix failing test Fix failing test: Mime::JS generates "text/javascript" --- actionpack/CHANGELOG.md | 2 ++ actionpack/test/controller/render_json_test.rb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'actionpack') diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index e827f935c3..6940bd45a0 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,5 +1,7 @@ ## Rails 4.0.0 (unreleased) ## +* JSONP now uses mimetype application/javascript instead of application/json *omjokine* + * Allow to lazy load `default_form_builder` by passing a `String` instead of a constant. *Piotr Sarnacki* * Session arguments passed to `process` calls in functional tests are now merged into 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 -- cgit v1.2.3