diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-05-02 03:21:40 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-05-02 03:21:40 -0300 |
| commit | 5e790d368c5d0e89cfd5ef1245e4b131be63716f (patch) | |
| tree | fe26ed0a2b3056dd67fe46558abd96712cef67d5 /actionpack/test/controller/render_test.rb | |
| parent | 9f36431f58c406312d0b0317543b7f69107e61e9 (diff) | |
| parent | 3be3470fab788856b4559742434f195cc6b1009a (diff) | |
| download | rails-5e790d368c5d0e89cfd5ef1245e4b131be63716f.tar.gz rails-5e790d368c5d0e89cfd5ef1245e4b131be63716f.tar.bz2 rails-5e790d368c5d0e89cfd5ef1245e4b131be63716f.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'actionpack/test/controller/render_test.rb')
| -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 |