diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-04-30 16:34:00 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-04-30 16:34:00 -0700 |
| commit | f0b9e2861943d32ca73a53ab5fb6f86d10c89b04 (patch) | |
| tree | c4df24e5369c67690c372bd4c9749a6f8a01a806 /actionpack/test/controller | |
| parent | 00d1a57e9f99a1b2439281cb741fd82ef47a5c55 (diff) | |
| download | rails-f0b9e2861943d32ca73a53ab5fb6f86d10c89b04.tar.gz rails-f0b9e2861943d32ca73a53ab5fb6f86d10c89b04.tar.bz2 rails-f0b9e2861943d32ca73a53ab5fb6f86d10c89b04.zip | |
Fix render :json => nil [#2589 state:resolved]
Diffstat (limited to 'actionpack/test/controller')
| -rw-r--r-- | actionpack/test/controller/render_test.rb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb index da063710a9..023bf0eeaa 100644 --- a/actionpack/test/controller/render_test.rb +++ b/actionpack/test/controller/render_test.rb @@ -194,6 +194,10 @@ class TestController < ActionController::Base render :inline => "<%= controller_name %>" end + def render_json_nil + render :json => nil + end + def render_json_hello_world render :json => ActiveSupport::JSON.encode(:hello => 'world') end @@ -874,6 +878,12 @@ class RenderTest < ActionController::TestCase assert_equal "The secret is in the sauce\n", @response.body end + def test_render_json_nil + get :render_json_nil + assert_equal 'null', @response.body + assert_equal 'application/json', @response.content_type + end + def test_render_json get :render_json_hello_world assert_equal '{"hello":"world"}', @response.body |