Merge branch 'sandboxws-master'

exAspArk · Oct 18, 2018 · e4a449a · e4a449a
2 parents c8b379e + 8281a48
commit e4a449a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -2,6 +2,8 @@ sudo: false
 language: ruby
 rvm:
   - 2.3.4
+  - 2.4.3
+  - 2.5.1
 env:
   - CI=true
 before_install: gem install bundler -v 1.15.2

diff --git a/lib/graphql/guard.rb b/lib/graphql/guard.rb
@@ -75,7 +75,7 @@ def inline_type_guard(type)
   GraphQL::Field.accepts_definitions(mask: GraphQL::Define.assign_metadata_key(:mask))
 end
 
-if GraphQL::Schema::Object.respond_to?(:accepts_definition) # GraphQL-Ruby version >= 1.8
+if Object.const_defined?('GraphQL::Schema::Object') && GraphQL::Schema::Object.respond_to?(:accepts_definition) # GraphQL-Ruby version >= 1.8
   GraphQL::Schema::Object.accepts_definition(:guard)
   GraphQL::Schema::Field.accepts_definition(:guard)
   GraphQL::Schema::Field.accepts_definition(:mask)