Skip to content

Commit e89a815

Browse files
committed
Fix tests
Set adapter only if there isn't set yet
1 parent 53d0e62 commit e89a815

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

lib/action_controller/serialization.rb

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,10 @@ def get_serializer(resource, options = {})
2626
options[:adapter] = false
2727
end
2828

29-
options[:adapter] ||= ActiveModel::Serializer::Adapter.by_request(request)
29+
unless options[:adapter]
30+
adapter = ActiveModel::Serializer::Adapter.by_request(request)
31+
options[:adapter] ||= adapter if adapter
32+
end
3033

3134
ActiveModel::SerializableResource.serialize(resource, options) do |serializable_resource|
3235
if serializable_resource.serializer?

0 commit comments

Comments
 (0)