Add latest changes from gitlab-org/gitlab@master

1 files changed, 2 insertions, 2 deletions

diff --git a/spec/support/graphql/arguments.rb b/spec/support/graphql/arguments.rb
index 20e940030f8..a5bb01c31a3 100644
--- a/spec/support/graphql/arguments.rb
+++ b/spec/support/graphql/arguments.rb
@@ -40,7 +40,7 @@ module Graphql
       when Array then "[#{value.map { |v| as_graphql_literal(v) }.join(',')}]"
       when Hash then "{#{new(value)}}"
       when Integer, Float, Symbol then value.to_s
-      when String then "\"#{value.gsub(/"/, '\\"')}\""
+      when String, GlobalID then "\"#{value.to_s.gsub(/"/, '\\"')}\""
       when Time, Date then "\"#{value.iso8601}\""
       when nil then 'null'
       when true then 'true'
@@ -49,7 +49,7 @@ module Graphql
         value.to_graphql_value
       end
     rescue NoMethodError
-      raise ArgumentError, "Cannot represent #{value} as GraphQL literal"
+      raise ArgumentError, "Cannot represent #{value} (instance of #{value.class}) as GraphQL literal"
     end
 
     def merge(other)