Merge pull request #26 from exAspArk/ruby-2.6

Make Ruby 2.6 and GraphQL 1.7 compatible
exAspArk · Mar 4, 2019 · 83ed52e · 83ed52e
2 parents 84aea1f + dd415d3
commit 83ed52e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-2.3.4
+2.6.1
diff --git a/.travis.yml b/.travis.yml
@@ -5,19 +5,25 @@ matrix:
   include:
     - gemfile: graphql-1.7.gemfile
       env: GRAPHQL_RUBY_VERSION=1_7 CI=true
-      rvm: 2.3.4
+      rvm: 2.3.8
     - gemfile: graphql-1.8.gemfile
       env: GRAPHQL_RUBY_VERSION=1_8 CI=true
-      rvm: 2.3.4
+      rvm: 2.3.8
     - gemfile: graphql-1.7.gemfile
       env: GRAPHQL_RUBY_VERSION=1_7 CI=true
-      rvm: 2.4.3
+      rvm: 2.4.5
     - gemfile: graphql-1.8.gemfile
       env: GRAPHQL_RUBY_VERSION=1_8 CI=true
-      rvm: 2.4.3
+      rvm: 2.4.5
     - gemfile: graphql-1.7.gemfile
       env: GRAPHQL_RUBY_VERSION=1_7 CI=true
-      rvm: 2.5.1
+      rvm: 2.5.3
     - gemfile: graphql-1.8.gemfile
       env: GRAPHQL_RUBY_VERSION=1_8 CI=true
-      rvm: 2.5.1
+      rvm: 2.5.3
+    - gemfile: graphql-1.7.gemfile
+      env: GRAPHQL_RUBY_VERSION=1_7 CI=true
+      rvm: 2.6.1
+    - gemfile: graphql-1.8.gemfile
+      env: GRAPHQL_RUBY_VERSION=1_8 CI=true
+      rvm: 2.6.1
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 Object.const_defined?('GraphQL::Schema::Object') && GraphQL::Schema::Object.respond_to?(:accepts_definition) # GraphQL-Ruby version >= 1.8
+if 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)