Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Add changelog entry for jsonp mimetype change, fix failing test #6047

Merged
merged 1 commit into from

2 participants

@carlosantoniodasilva

Add changelog entry for the mimetype change for jsonp requests:
d4dd1af

Fix failing test: Mime::JS generates "text/javascript" instead of
"application/javascript"

@josevalim josevalim merged commit 8c2cf1a into from
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Apr 29, 2012
  1. @carlosantoniodasilva

    Add changelog entry for jsonp mimetype change, fix failing test

    carlosantoniodasilva authored
    Fix failing test: Mime::JS generates "text/javascript"
This page is out of date. Refresh to see the latest.
View
2  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
View
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
end
def test_render_json_with_custom_content_type
Something went wrong with that request. Please try again.