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

Merge pull request #1884 from bf4/simplify_relationship

Browse Source 
* Simplify Relationship
This commit is contained in:
Benjamin Fleischer
2016-08-17 16:18:14 -05:00
committed by GitHub
parent 26bcdbe44a abb15b9622
commit 455068d455
4 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
test/adapter/json_api/relationship_test.rb
View File

@@ -150,9 +150,23 @@ module ActiveModelSerializers
private
def test_relationship(expected, params = {})
def test_relationship(expected, test_options = {})
parent_serializer = AuthorSerializer.new(@author)
relationship = Relationship.new(parent_serializer, @serializer, nil, params)
serializable_resource_options = {} # adapter.instance_options
meta = test_options.delete(:meta)
options = test_options.delete(:options)
links = test_options.delete(:links)
association_serializer = @serializer
if association_serializer && association_serializer.object
association_name = association_serializer.json_key.to_sym
association = ::ActiveModel::Serializer::Association.new(association_name, association_serializer, options, links, meta)
else
association = ::ActiveModel::Serializer::Association.new(:association_name_not_used, association, options, links, meta)
end
relationship = Relationship.new(parent_serializer, serializable_resource_options, association)
assert_equal(expected, relationship.as_json)
end
end

8
test/support/serialization_testing.rb
View File

@@ -9,12 +9,12 @@ module SerializationTesting
ActiveModelSerializers::SerializableResource.new(obj).to_json
end
def with_namespace_separator(seperator)
original_seperator = ActiveModelSerializers.config.jsonapi_namespace_separator
ActiveModelSerializers.config.jsonapi_namespace_separator = seperator
def with_namespace_separator(separator)
original_separator = ActiveModelSerializers.config.jsonapi_namespace_separator
ActiveModelSerializers.config.jsonapi_namespace_separator = separator
yield
ensure
ActiveModelSerializers.config.jsonapi_namespace_separator = original_seperator
ActiveModelSerializers.config.jsonapi_namespace_separator = original_separator
end
# Aliased as :with_configured_adapter to clarify that