Add a test for subclass; unwrap objects before passing to handler

Author: rmosolgo

lib/graphql/execution/errors.rb

@@ -47,6 +47,9 @@ def with_error_handling(trace_data)
           args = trace_data[:arguments]
           ctx = trace_data[:query].context
           field = trace_data[:field]
+          if obj.is_a?(GraphQL::Schema::Object)
+            obj = obj.object
+          end
           handler.call(err, obj, args, ctx, field)
         else
           raise err

spec/graphql/execution/errors_spec.rb

@@ -13,12 +13,14 @@ def initialize(value:)
       end
     end
 
+    class ErrorASubclass < ErrorA; end
+
     use GraphQL::Execution::Interpreter
     use GraphQL::Analysis::AST
     use GraphQL::Execution::Errors
 
     rescue_from(ErrorA) do |err, obj, args, ctx, field|
-      ctx[:errors] << "#{err.message} (#{obj.class.name}.#{field.graphql_name}, #{args.inspect})"
+      ctx[:errors] << "#{err.message} (#{field.owner.name}.#{field.graphql_name}, #{obj.inspect}, #{args.inspect})"
       nil
     end
 
@@ -55,6 +57,10 @@ def f4
         raise ErrorC.new(value: 20)
       end
 
+      field :f5, Int, null: true
+      def f5
+        raise ErrorASubclass, "raised subclass"
+      end
     end
 
     query(Query)
@@ -65,14 +71,14 @@ def f4
       ctx = { errors: [] }
       res = ErrorsTestSchema.execute "{ f1(a1: 1) }", context: ctx, root_value: :abc
       assert_equal({ "data" => { "f1" => nil } }, res)
-      assert_equal ["f1 broke (ErrorsTestSchema::Query.f1, {:a1=>1})"], ctx[:errors]
+      assert_equal ["f1 broke (ErrorsTestSchema::Query.f1, :abc, {:a1=>1})"], ctx[:errors]
     end
 
     it "rescues errors from lazy code" do
       ctx = { errors: [] }
       res = ErrorsTestSchema.execute("{ f2 }", context: ctx)
       assert_equal({ "data" => { "f2" => nil } }, res)
-      assert_equal ["f2 broke (ErrorsTestSchema::Query.f2, {})"], ctx[:errors]
+      assert_equal ["f2 broke (ErrorsTestSchema::Query.f2, nil, {})"], ctx[:errors]
     end
 
     it "can raise new errors" do
@@ -89,5 +95,12 @@ def f4
       res = ErrorsTestSchema.execute("{ f4 }")
       assert_equal({ "data" => { "f4" => 20 } }, res)
     end
+
+    it "rescues subclasses" do
+      context = { errors: [] }
+      res = ErrorsTestSchema.execute("{ f5 }", context: context)
+      assert_equal({ "data" => { "f5" => nil } }, res)
+      assert_equal ["raised subclass (ErrorsTestSchema::Query.f5, nil, {})"], context[:errors]
+    end
   end
 end