Merge pull request rmosolgo#2383 from rmosolgo/fix-method-warning-again

Fix warning and method detection

Author: rmosolgo

lib/graphql/schema/field.rb

@@ -205,7 +205,7 @@ def initialize(type: nil, name: nil, owner: nil, null: nil, field: nil, function
 
         # TODO: I think non-string/symbol hash keys are wrongly normalized (eg `1` will not work)
         method_name = method || hash_key || @underscored_name
-        resolver_method ||= @underscored_name
+        resolver_method ||= @underscored_name.to_sym
 
         @method_str = method_name.to_s
         @method_sym = method_name.to_sym

lib/graphql/schema/member/has_fields.rb

@@ -53,8 +53,8 @@ def get_field(field_name)
         # @param field_defn [GraphQL::Schema::Field]
         # @return [void]
         def add_field(field_defn)
-          if CONFLICT_FIELD_NAMES.include?(field_defn.method_sym)
-            warn "#{self.graphql_name}'s `field :#{field_defn.name}` conflicts with a built-in method, use `resolver_method:` to pick a different resolver method for this field (for example, `resolver_method: :resolve_#{field_defn.method_sym}` and `def resolve_#{field_defn.method_sym}`)"
+          if CONFLICT_FIELD_NAMES.include?(field_defn.resolver_method)
+            warn "#{self.graphql_name}'s `field :#{field_defn.name}` conflicts with a built-in method, use `resolver_method:` to pick a different resolver method for this field (for example, `resolver_method: :resolve_#{field_defn.resolver_method}` and `def resolve_#{field_defn.resolver_method}`)"
           end
           own_fields[field_defn.name] = field_defn
           nil

spec/graphql/schema/object_spec.rb

@@ -328,7 +328,7 @@ def call(o, a, c)
       assert_output "", "" do
         Class.new(GraphQL::Schema::Object) do
           graphql_name "X"
-          field :method, String, null: true, method: :resolve_method
+          field :method, String, null: true, resolver_method: :resolve_method
         end
       end
     end