Merge pull request #1214 from NullVoxPopuli/issue/1211-failing-test

Fix #1211, include_tree is null when using the key: options
2026-01-25 07:16:49 +00:00 · 2015-10-02 15:29:04 +02:00
parent b8a5bbd860 f8323fc9e5
commit 34d65716cb
3 changed files with 20 additions and 1 deletions
--- a/lib/active_model/serializer/associations.rb
+++ b/lib/active_model/serializer/associations.rb
@@ -92,7 +92,8 @@ module ActiveModel

        Enumerator.new do |y|
          self.class._reflections.each do |reflection|
-            next unless include_tree.key?(reflection.name)
+            key = reflection.options.fetch(:key, reflection.name)
+            next unless include_tree.key?(key)
            y.yield reflection.build_association(self, instance_options)
          end
        end