Skip to content
Browse files

Add changelog entry for jsonp mimetype change, fix failing test

Fix failing test: Mime::JS generates "text/javascript"
  • Loading branch information...
1 parent 6bea191 commit 65df4c53c2f6055618cd23c8a399074a4c5bffe2 @carlosantoniodasilva carlosantoniodasilva committed
2  actionpack/
@@ -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
2  actionpack/test/controller/render_json_test.rb
@@ -102,7 +102,7 @@ def test_render_json_with_status
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
def test_render_json_with_custom_content_type

0 comments on commit 65df4c5

Please sign in to comment.
Something went wrong with that request. Please try again.