diff options
author | José Valim <jose.valim@gmail.com> | 2010-04-22 12:12:38 +0200 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2010-04-22 12:12:38 +0200 |
commit | 81fb742488e696ee7a7a8b1a620bc93deb1fad77 (patch) | |
tree | 8a82b9f279fc731f4e7a6d68179b8fd6bb9e38fb /actionpack/test/controller/render_json_test.rb | |
parent | 4163ccec2343ee66e2488f067eab2a15260e1219 (diff) | |
download | rails-81fb742488e696ee7a7a8b1a620bc93deb1fad77.tar.gz rails-81fb742488e696ee7a7a8b1a620bc93deb1fad77.tar.bz2 rails-81fb742488e696ee7a7a8b1a620bc93deb1fad77.zip |
Always downstream given options in :json, :xml and :js renderers and add tests for it.
Diffstat (limited to 'actionpack/test/controller/render_json_test.rb')
-rw-r--r-- | actionpack/test/controller/render_json_test.rb | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/actionpack/test/controller/render_json_test.rb b/actionpack/test/controller/render_json_test.rb index 2580ada88b..5958b18d80 100644 --- a/actionpack/test/controller/render_json_test.rb +++ b/actionpack/test/controller/render_json_test.rb @@ -3,6 +3,14 @@ require 'controller/fake_models' require 'pathname' class RenderJsonTest < ActionController::TestCase + class JsonRenderable + def as_json(options={}) + hash = { :a => :b, :c => :d, :e => :f } + hash.except!(*options[:except]) if options[:except] + hash + end + end + class TestController < ActionController::Base protect_from_forgery @@ -37,6 +45,10 @@ class RenderJsonTest < ActionController::TestCase def render_json_with_render_to_string render :json => {:hello => render_to_string(:partial => 'partial')} end + + def render_json_with_extra_options + render :json => JsonRenderable.new, :except => [:c, :e] + end end tests TestController @@ -91,4 +103,10 @@ class RenderJsonTest < ActionController::TestCase assert_equal '{"hello":"partial html"}', @response.body assert_equal 'application/json', @response.content_type end + + def test_render_json_forwards_extra_options + get :render_json_with_extra_options + assert_equal '{"a":"b"}', @response.body + assert_equal 'application/json', @response.content_type + end end |