Merge pull request #3431 from ogidow/fix-error-handlers

Fix find_handler_for method

Author: Robert Mosolgo

lib/graphql/execution/errors.rb

@@ -115,7 +115,7 @@ def with_error_handling(ctx)
           if obj.is_a?(GraphQL::Schema::Object)
             obj = obj.object
           end
-          handler.call(err, obj, args, ctx, field)
+          handler[:handler].call(err, obj, args, ctx, field)
         else
           raise err
         end
@@ -148,11 +148,11 @@ def find_handler_for(error_class)
         # If there's an inherited one, but not one defined here, use the inherited one.
         # Otherwise, there's no handler for this error, return `nil`.
         if parent_handler && handler && parent_handler[:class] < handler[:class]
-          parent_handler[:handler]
+          parent_handler
         elsif handler
-          handler[:handler]
+          handler
         elsif parent_handler
-          parent_handler[:handler]
+          parent_handler
         else
           nil
         end

spec/graphql/execution/errors_spec.rb

@@ -2,7 +2,16 @@
 require "spec_helper"
 
 describe "GraphQL::Execution::Errors" do
-  class ErrorsTestSchema < GraphQL::Schema
+  class ParentErrorsTestSchema < GraphQL::Schema
+    class ErrorD < RuntimeError; end
+
+    rescue_from(ErrorD) do |err, obj, args, ctx, field|
+      raise GraphQL::ExecutionError, "ErrorD on #{obj.inspect} at #{field ? "#{field.path}(#{args})" : "boot"}"
+    end
+  end
+
+  class ErrorsTestSchema < ParentErrorsTestSchema
+    ErrorD = ParentErrorsTestSchema::ErrorD
     class ErrorA < RuntimeError; end
     class ErrorB < RuntimeError; end
     class ErrorC < RuntimeError
@@ -12,7 +21,6 @@ def initialize(value:)
         super
       end
     end
-    class ErrorD < RuntimeError; end
 
     class ErrorASubclass < ErrorA; end
     class ErrorBChildClass < ErrorB; end
@@ -42,9 +50,6 @@ class ErrorBGrandchildClass < ErrorBChildClass; end
       err.value
     end
 
-    rescue_from(ErrorD) do |err, obj, args, ctx, field|
-      raise GraphQL::ExecutionError, "ErrorD on #{obj.inspect} at #{field ? "#{field.path}(#{args})" : "boot"}"
-    end
 
     class Thing < GraphQL::Schema::Object
       def self.authorized?(obj, ctx)