ditkrg/active_model_serializers
5
0
Fork 0
mirror of https://github.com/ditkrg/active_model_serializers.git synced 2026-01-25 07:16:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1695 from beauby/meta-madness

Browse Source 
Meta no longer handled in Base adapter.
This commit is contained in:
Lucas Hosseini
2016-04-22 01:13:06 +02:00
parent f0fa74328f e804d37924
commit b4e2ac300c
5 changed files with 22 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
test/serializers/meta_test.rb
View File

@@ -92,7 +92,7 @@ module ActiveModel
assert_equal(expected, actual)
end
def test_meta_key_is_used_with_json_api
def test_meta_key_is_not_used_with_json_api
actual = ActiveModelSerializers::SerializableResource.new(
@blog,
adapter: :json_api,
@@ -105,25 +105,25 @@ module ActiveModel
type: 'blogs',
attributes: { title: 'AMS Hints' }
},
'haha_meta' => { total: 10 }
meta: { total: 10 }
}
assert_equal(expected, actual)
end
def test_meta_key_is_not_present_when_blank_object_with_json_api
def test_meta_key_is_present_when_empty_hash_with_json_api
actual = ActiveModelSerializers::SerializableResource.new(
@blog,
adapter: :json_api,
serializer: AlternateBlogSerializer,
meta: {},
meta_key: 'haha_meta'
meta: {}
).as_json
expected = {
data: {
id: '1',
type: 'blogs',
attributes: { title: 'AMS Hints' }
}
},
meta: {}
}
assert_equal(expected, actual)
end
@@ -133,8 +133,7 @@ module ActiveModel
@blog,
adapter: :json_api,
serializer: AlternateBlogSerializer,
meta: '',
meta_key: 'haha_meta'
meta: ''
).as_json
expected = {
data: {