Merge pull request rmosolgo#4341 from klaudia-janiec/fix-rescue-from

Fix handle_or_reraise with arguments validation

Author: rmosolgo

lib/graphql/schema.rb

@@ -755,7 +755,7 @@ def handle_or_reraise(context, err)
         if handler
           obj = context[:current_object]
           args = context[:current_arguments]
-          args = args && args.keyword_arguments
+          args = args && args.respond_to?(:keyword_arguments) ? args.keyword_arguments : nil
           field = context[:current_field]
           if obj.is_a?(GraphQL::Schema::Object)
             obj = obj.object

spec/graphql/schema/argument_spec.rb

@@ -696,4 +696,46 @@ def get_echo_for(use_if)
       assert_equal "method-default", get_echo_for(:visible_4) # no match
     end
   end
+
+  describe "multiple argument validations with rescue_from" do
+    let(:schema) do
+      Class.new(GraphQL::Schema) do
+        rescue_from(StandardError) do |exception, _obj, _args, _context, _field|
+          raise exception
+        end
+
+        query_type = Class.new(GraphQL::Schema::Object) do
+          graphql_name 'TestQueryType'
+
+          field :test, Integer, null: false do
+            argument :a, Integer, validates: { numericality: { greater_than_or_equal_to: 1 } }
+            argument :b, Integer, validates: { numericality: { greater_than_or_equal_to: 1 } }
+          end
+
+          def test; end
+        end
+
+        query(query_type)
+        lazy_resolve(Proc, :call)
+      end
+    end
+
+    it 'validates both arguments' do
+      expected_errors = [
+        {
+          "message"=>"a must be greater than or equal to 1",
+          "locations"=>[{ "line"=>1, "column"=>3 }],
+          "path"=>["test"]
+        },
+        {
+          "message"=>"b must be greater than or equal to 1",
+          "locations"=>[{"line"=>1, "column"=>3}],
+          "path"=>["test"]
+        }
+      ]
+      query = "{ test(a: -4, b: -5) }"
+
+      assert_equal expected_errors, schema.execute(query).to_h['errors']
+    end
+  end
 end