Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: carlosantoniodasilva/rails
...
head fork: carlosantoniodasilva/rails
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 2 files changed
  • 0 commit comments
  • 2 contributors
Commits on Apr 29, 2012
@carlosantoniodasilva Add changelog entry for jsonp mimetype change, fix failing test
Fix failing test: Mime::JS generates "text/javascript"
65df4c5
@josevalim josevalim Merge pull request #6047 from carlosantoniodasilva/changelog-jsonp-mi…
…metype

Add changelog entry for jsonp mimetype change, fix failing test
8c2cf1a
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

No commit comments for this range

Something went wrong with that request. Please try again.