Merge pull request rmosolgo#2454 from rmosolgo/enum-args-conflict

rmosolgo · web-flow · commit 7f43a0a007f5 · 2019-08-29T15:40:04.000-04:00
Fix enum argument conflict
diff --git a/lib/graphql/static_validation/rules/fields_will_merge.rb b/lib/graphql/static_validation/rules/fields_will_merge.rb
@@ -330,22 +330,29 @@ def possible_arguments(field1, field2)
         # Check for incompatible / non-identical arguments on this node:
         [field1, field2].map do |n|
           if n.arguments.any?
-            n.arguments.reduce({}) do |memo, a|
+            serialized_args = {}
+            n.arguments.each do |a|
               arg_value = a.value
-              memo[a.name] = case arg_value
-              when GraphQL::Language::Nodes::AbstractNode
-                arg_value.to_query_string
-              else
-                GraphQL::Language.serialize(arg_value)
-              end
-              memo
+              serialized_args[a.name] = serialize_arg(arg_value)
             end
+            serialized_args
           else
             NO_ARGS
           end
         end.uniq
       end
 
+      def serialize_arg(arg_value)
+        case arg_value
+        when GraphQL::Language::Nodes::AbstractNode
+          arg_value.to_query_string
+        when Array
+          "[#{arg_value.map { |a| serialize_arg(a) }.join(", ")}]"
+        else
+          GraphQL::Language.serialize(arg_value)
+        end
+      end
+
       def compared_fragments_key(frag1, frag2, exclusive)
         # Cache key to not compare two fragments more than once.
         # The key includes both fragment names sorted (this way we
diff --git a/spec/graphql/static_validation/rules/fields_will_merge_spec.rb b/spec/graphql/static_validation/rules/fields_will_merge_spec.rb
@@ -601,6 +601,69 @@
     end
   end
 
+  describe "arguments that are a list of enums, in fragments" do
+    let(:schema) {
+      GraphQL::Schema.from_definition <<-GRAPHQL
+      type Query {
+        field(categories: [Category!]): Int
+      }
+
+      enum Category {
+        A
+        B
+        C
+      }
+      GRAPHQL
+    }
+
+    describe "When there's not a conflict" do
+      let(:query_string) {
+        "
+        {
+          field(categories: [A, B, C])
+          ...Q
+        }
+        fragment Q on Query {
+          field(categories: [A, B, C])
+        }
+        "
+      }
+
+      it "doesn't find errors" do
+        assert_equal [], errors
+      end
+    end
+
+    describe "When there is a conflict" do
+      let(:query_string) {
+        "
+        {
+          field(categories: [A, B])
+          ...Q
+        }
+        fragment Q on Query {
+          field(categories: [A, B, C])
+        }
+        "
+      }
+
+      it "adds an error" do
+        expected_error = {
+          "message"=>"Field 'field' has an argument conflict: {categories:\"[A, B]\"} or {categories:\"[A, B, C]\"}?",
+          "locations"=>[{"line"=>3, "column"=>11}, {"line"=>7, "column"=>11}],
+          "path"=>[],
+          "extensions"=> {
+            "code"=>"fieldConflict",
+            "fieldName"=>"field",
+            "conflicts"=>"{categories:\"[A, B]\"} or {categories:\"[A, B, C]\"}"
+          }
+        }
+
+        assert_equal [expected_error], errors
+      end
+    end
+  end
+
   describe "return types must be unambiguous" do
     let(:schema) {
       GraphQL::Schema.from_definition(%|
