test cases by fblee

Merge remote-tracking branch 'fblee/master'
This commit is contained in:
Michi Huber 2013-02-26 09:57:35 +01:00
commit 9f93f34a34

View File

@ -63,6 +63,10 @@ class RenderJsonTest < ActionController::TestCase
end end
end end
class DummyCustomSerializer < ActiveModel::Serializer
attributes :id
end
class HypermediaSerializable class HypermediaSerializable
def active_model_serializer def active_model_serializer
HypermediaSerializer HypermediaSerializer
@ -117,6 +121,11 @@ class RenderJsonTest < ActionController::TestCase
render :json => ActiveSupport::JSON.encode(:hello => 'world') render :json => ActiveSupport::JSON.encode(:hello => 'world')
end end
def render_json_nil_with_custom_serializer
render :json => nil, :serializer => DummyCustomSerializer
end
def render_json_with_extra_options def render_json_with_extra_options
render :json => JsonRenderable.new, :except => [:c, :e] render :json => JsonRenderable.new, :except => [:c, :e]
end end
@ -216,6 +225,11 @@ class RenderJsonTest < ActionController::TestCase
assert_equal '[]', @response.body assert_equal '[]', @response.body
end end
def test_render_json_nil_with_custom_serializer
get :render_json_nil_with_custom_serializer
assert_equal 'null', @response.body
end
def test_render_json def test_render_json
get :render_json_hello_world get :render_json_hello_world
assert_equal '{"hello":"world"}', @response.body assert_equal '{"hello":"world"}', @response.body