Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from Apr 29, 2012
Jump to file or symbol
Failed to load files and symbols.
+3 −1
Split
View
@@ -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
@@ -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