Update union_spec.rb and improve type resolution

Author: rmosolgo

lib/graphql/execution/field_resolve_step.rb

@@ -442,7 +442,16 @@ def enqueue_next_steps
               if (object_type = @runner.runtime_type_at[result])
                 # OK
               else
-                object_type = @runner.resolve_type(@static_type, next_object, query)
+                query.current_trace.begin_resolve_type(@static_type, next_object, query.context)
+                object_type = query.resolve_type(@static_type, next_object)
+                if object_type.is_a?(Array)
+                  object_type, next_object = object_type
+                end
+                if @runner.resolves_lazies && @runner.lazy?(object_type)
+                  # TODO batch this
+                  object_type = sync(object_type)
+                end
+                query.current_trace.end_resolve_type(@static_type, next_object, query.context, object_type)
                 @runner.runtime_type_at[result] = object_type
               end
               next_objects_by_type[object_type] << next_object

spec/graphql/schema/union_spec.rb

@@ -112,17 +112,25 @@ def self.resolve_type(object, ctx)
         end
 
         class Query < GraphQL::Schema::Object
-          field :boxed_union, BoxedUnion
+          field :boxed_union, BoxedUnion, resolve_static: true
 
-          def boxed_union
+          def self.boxed_union(context)
             Box.new(context[:value])
           end
 
-          field :unboxed_union, UnboxedUnion
+          def boxed_union
+            self.class.boxed_union(context)
+          end
+
+          field :unboxed_union, UnboxedUnion, resolve_static: true
 
-          def unboxed_union
+          def self.unboxed_union(context)
             context[:value]
           end
+
+          def unboxed_union
+            self.class.unboxed_union(context)
+          end
         end
 
         query(Query)
@@ -410,29 +418,33 @@ def unboxed_union
   describe "use with loads:" do
     class UnionLoadsSchema < GraphQL::Schema
       class Image < GraphQL::Schema::Object
-        field :title, String
+        field :title, String, hash_key: :title
       end
 
       class Video < GraphQL::Schema::Object
-        field :title, String
+        field :title, String, hash_key: :title
       end
 
       class Post < GraphQL::Schema::Object
-        field :title, String
+        field :title, String, hash_key: :title
       end
 
       class MediaItem < GraphQL::Schema::Union
         possible_types Image, Video
       end
 
       class Query < GraphQL::Schema::Object
-        field :media_item_type, String do
+        field :media_item_type, String, resolve_static: true do
           argument :id, ID, loads: MediaItem, as: :media_item
         end
 
-        def media_item_type(media_item:)
+        def self.media_item_type(context, media_item:)
           media_item[:type]
         end
+
+        def media_item_type(media_item:)
+          self.class.media_item_type(context, media_item: media_item)
+        end
       end
 
       query(Query)