Merge pull request #4772 from rmosolgo/fix-enum-values-named-type

Fix enum values named type

Author: rmosolgo

lib/graphql/language/parser.rb

@@ -333,7 +333,7 @@ def parse_enum_value_definitions
             v_loc = pos
             description = if at?(:STRING); string_value; end
             defn_loc = pos
-            enum_value = expect_token_value(:IDENTIFIER)
+            enum_value = parse_enum_name
             v_directives = parse_directives
             list << EnumValueDefinition.new(pos: v_loc, definition_pos: defn_loc, description: description, name: enum_value, directives: v_directives, filename: @filename, source_string: @graphql_str)
           end

spec/graphql/language/parser_spec.rb

@@ -132,6 +132,7 @@
         enum Thing {
           "VALUE description"
           VALUE
+          type
         }
       GRAPHQL
 
@@ -142,6 +143,10 @@
       value_defn = thing_defn.values[0]
       assert_equal "VALUE", value_defn.name
       assert_equal "VALUE description", value_defn.description
+
+      value_defn = thing_defn.values[1]
+      assert_equal "type", value_defn.name
+      assert_nil value_defn.description
     end
 
     it "is parsed for directive definitions" do