disabling custom root option

This commit is contained in:
João Moura 2015-06-15 15:58:39 -03:00
parent d061b2e9f4
commit 329691276a
2 changed files with 1 additions and 39 deletions

View File

@ -168,11 +168,7 @@ module ActiveModel
end
def json_key
if root.nil?
self.class.root_name
else
root
end
self.class.root_name
end
def id

View File

@ -173,20 +173,6 @@ module ActionController
assert_equal expected.to_json, @response.body
end
def test_render_using_custom_root
get :render_using_custom_root
assert_equal 'application/json', @response.content_type
assert_equal '{"custom_root":{"name":"Name 1","description":"Description 1"}}', @response.body
end
def test_render_using_custom_root_and_meta
get :render_using_custom_root_and_meta
assert_equal 'application/json', @response.content_type
assert_equal '{"custom_root":{"name":"Name 1","description":"Description 1"},"meta":{"total":10}}', @response.body
end
def test_render_using_default_root
get :render_using_default_adapter_root
@ -223,26 +209,6 @@ module ActionController
assert_equal expected.to_json, @response.body
end
def test_render_array_using_custom_root_and_meta
get :render_array_using_custom_root_and_meta
assert_equal 'application/json', @response.content_type
expected = { custom_root: [
{
name: 'Name 1',
description: 'Description 1',
},
{
name: 'Name 2',
description: 'Description 2',
}],
meta: { total: 10 }
}
assert_equal expected.to_json, @response.body
end
def test_render_array_using_implicit_serializer
get :render_array_using_implicit_serializer
assert_equal 'application/json', @response.content_type