Fix tracing and objects in partials on abstract type

Author: rmosolgo

lib/graphql/execution/next/runner.rb

@@ -260,7 +260,6 @@ def begin_execute(isolated_steps, results, query, root_type, root_value)
             end
 
             results << { "data" => data }
-
             objects = [root_value]
             query.current_trace.objects(root_type, objects, query.context)
 
@@ -316,6 +315,8 @@ def begin_execute(isolated_steps, results, query, root_type, root_value)
             if resolves_lazies
               resolved_type = schema.sync_lazy(resolved_type)
             end
+            objects = [root_value]
+            query.current_trace.objects(resolved_type, objects, query.context)
             runtime_type_at[data] = resolved_type
             results << { "data" => data }
             isolated_steps[0] << SelectionsStep.new(

spec/graphql/tracing/trace_spec.rb

@@ -12,10 +12,15 @@
 
   describe "object hooks" do
     class ObjectHooksSchema < GraphQL::Schema
-      class Thing < GraphQL::Schema::Object
+      module Node
+        include GraphQL::Schema::Interface
         field :name, String
       end
 
+      class Thing < GraphQL::Schema::Object
+        implements Node
+      end
+
       class Query < GraphQL::Schema::Object
         field :things, [Thing], resolve_static: true
 
@@ -38,6 +43,14 @@ def self.thing(context, thing:)
         def self.thing_name(context, thing:)
           thing.name
         end
+
+        field :node, Node, resolve_static: true do
+          argument :id, ID, loads: Node, as: :node
+        end
+
+        def self.node(context, node:)
+          node
+        end
       end
 
       query(Query)
@@ -80,6 +93,14 @@ def object_loaded(argument_definition, object, context)
       res = ObjectHooksSchema.execute_next("{ thingName(thingId: \"77\") }")
       assert_equal "Thing #77", res["data"]["thingName"]
       assert_equal ["1 objects as Query", "Query.thingName.thingId loaded OpenStruct"], res.context[:log]
+
+      res = ObjectHooksSchema.execute_next("{ node(id: \"33\") { name } }")
+      assert_equal "Thing #33", res["data"]["node"]["name"]
+      assert_equal ["1 objects as Query", "Query.node.id loaded OpenStruct", "1 objects as Thing"], res.context[:log]
+
+      partial_res = res.query.run_partials([{ path: ["node"], object: OpenStruct.new(name: "Injected thing"), context: { log: [] } }])
+      assert_equal "Injected thing", partial_res[0]["data"]["name"]
+      assert_equal ["1 objects as Thing"], partial_res[0].context[:log]
     end
   end
 end