Skip to content

Commit f67fd97

Browse files
committed
Removing/Updating tests based on new FlattenJson adapter
1 parent 867d36a commit f67fd97

File tree

2 files changed

+6
-51
lines changed

2 files changed

+6
-51
lines changed

test/action_controller/serialization_test.rb

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,6 @@ def render_using_implicit_serializer
99
render json: @profile
1010
end
1111

12-
def render_using_custom_root
13-
with_adapter ActiveModel::Serializer::Adapter::Json do
14-
@profile = Profile.new({ name: 'Name 1', description: 'Description 1', comments: 'Comments 1' })
15-
render json: @profile, root: "custom_root"
16-
end
17-
end
18-
19-
def render_using_custom_root_and_meta
20-
with_adapter ActiveModel::Serializer::Adapter::Json do
21-
@profile = Profile.new({ name: 'Name 1', description: 'Description 1', comments: 'Comments 1' })
22-
render json: @profile, root: "custom_root", meta: { total: 10 }
23-
end
24-
end
25-
2612
def render_using_default_adapter_root
2713
with_adapter ActiveModel::Serializer::Adapter::JsonApi do
2814
# JSON-API adapter sets root by default
@@ -31,22 +17,6 @@ def render_using_default_adapter_root
3117
end
3218
end
3319

34-
def render_using_custom_root_in_adapter_with_a_default
35-
# JSON-API adapter sets root by default
36-
@profile = Profile.new({ name: 'Name 1', description: 'Description 1', comments: 'Comments 1' })
37-
render json: @profile, root: "profile", adapter: :json_api
38-
end
39-
40-
def render_array_using_custom_root_and_meta
41-
with_adapter ActiveModel::Serializer::Adapter::Json do
42-
array = [
43-
Profile.new({ name: 'Name 1', description: 'Description 1', comments: 'Comments 1' }),
44-
Profile.new({ name: 'Name 2', description: 'Description 2', comments: 'Comments 2' })
45-
]
46-
render json: array, root: "custom_root", meta: { total: 10 }
47-
end
48-
end
49-
5020
def render_array_using_implicit_serializer
5121
array = [
5222
Profile.new({ name: 'Name 1', description: 'Description 1', comments: 'Comments 1' }),
@@ -191,24 +161,6 @@ def test_render_using_default_root
191161
assert_equal expected.to_json, @response.body
192162
end
193163

194-
def test_render_using_custom_root_in_adapter_with_a_default
195-
get :render_using_custom_root_in_adapter_with_a_default
196-
197-
expected = {
198-
data: {
199-
id: assigns(:profile).id.to_s,
200-
type: "profiles",
201-
attributes: {
202-
name: "Name 1",
203-
description: "Description 1"
204-
}
205-
}
206-
}
207-
208-
assert_equal 'application/json', @response.content_type
209-
assert_equal expected.to_json, @response.body
210-
end
211-
212164
def test_render_array_using_implicit_serializer
213165
get :render_array_using_implicit_serializer
214166
assert_equal 'application/json', @response.content_type

test/serializers/meta_test.rb

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ def setup
1313

1414
def test_meta_is_present_with_root
1515
serializer = AlternateBlogSerializer.new(@blog, meta: {total: 10})
16-
adapter = ActiveModel::Serializer::Adapter::Json.new(serializer, root: 'blog')
16+
adapter = ActiveModel::Serializer::Adapter::Json.new(serializer)
1717
expected = {
1818
alternate_blog: {
1919
id: 1,
@@ -27,6 +27,7 @@ def test_meta_is_present_with_root
2727
end
2828

2929
def test_meta_is_not_included_when_root_is_missing
30+
# load_adapter uses FlattenJson Adapter
3031
adapter = load_adapter(meta: {total: 10})
3132
expected = {
3233
id: 1,
@@ -36,7 +37,7 @@ def test_meta_is_not_included_when_root_is_missing
3637
end
3738

3839
def test_meta_key_is_used
39-
serializer = AlternateBlogSerializer.new(@blog, root: 'blog', meta: {total: 10}, meta_key: "haha_meta")
40+
serializer = AlternateBlogSerializer.new(@blog, meta: {total: 10}, meta_key: "haha_meta")
4041
adapter = ActiveModel::Serializer::Adapter::Json.new(serializer, root: 'blog')
4142
expected = {
4243
alternate_blog: {
@@ -52,6 +53,7 @@ def test_meta_key_is_used
5253

5354
def test_meta_is_not_present_on_arrays_without_root
5455
serializer = ArraySerializer.new([@blog], meta: {total: 10})
56+
# FlattenJSON doesn't have support to root
5557
adapter = ActiveModel::Serializer::Adapter::FlattenJson.new(serializer)
5658
expected = [{
5759
id: 1,
@@ -71,7 +73,8 @@ def test_meta_is_not_present_on_arrays_without_root
7173

7274
def test_meta_is_present_on_arrays_with_root
7375
serializer = ArraySerializer.new([@blog], meta: {total: 10}, meta_key: "haha_meta")
74-
adapter = ActiveModel::Serializer::Adapter::Json.new(serializer, root: 'blog')
76+
# JSON adapter adds root by default
77+
adapter = ActiveModel::Serializer::Adapter::Json.new(serializer)
7578
expected = {
7679
blogs: [{
7780
id: 1,

0 commit comments

Comments
 (0)