refactor(test) parameterize the default execution strategy for testing

Author: rmosolgo

.travis.yml

@@ -3,6 +3,7 @@ language: ruby
 sudo: false
 cache: bundler
 env: CODECLIMATE_REPO_TOKEN=f5b27b2e25d3f4e199bb2566fb4fd4507144a004c71d4aa33a32c2df5f940333
+script: bundle exec test_both_strategies
 
 rvm:
 - 2.1.0 # Lowest version officially supported by that gem

Rakefile

@@ -9,6 +9,12 @@ Rake::TestTask.new do |t|
   t.warning = false
 end
 
+desc "Run the test suite on both built-in execution strategies"
+task :test_both_strategies do
+  system "bundle exec rake test"
+  system "GRAPHQL_EXEC_STRATEGY=serial bundle exec rake test"
+end
+
 require 'rubocop/rake_task'
 RuboCop::RakeTask.new(:rubocop) do |t|
   t.patterns = Rake::FileList['lib/**/{*}.rb', 'spec/**/*.rb']

lib/graphql/schema.rb

@@ -95,7 +95,7 @@ def initialize
       @object_from_id_proc = nil
       @id_from_object_proc = nil
       # Default to the built-in execution strategy:
-      @query_execution_strategy = GraphQL::Execution::DeferredExecution
+      @query_execution_strategy = GraphQL::Query::SerialExecution
       @mutation_execution_strategy = GraphQL::Query::SerialExecution
       @subscription_execution_strategy = GraphQL::Query::SerialExecution
     end

spec/graphql/analysis/query_complexity_spec.rb

@@ -258,7 +258,8 @@
       GraphQL::Schema.define(
         query: query_type,
         orphan_types: [double_complexity_type],
-        resolve_type: :pass
+        resolve_type: :pass,
+        query_execution_strategy: DEFAULT_EXEC_STRATEGY,
       )
     }
     let(:query_string) {%|

spec/graphql/argument_spec.rb

@@ -10,7 +10,7 @@
     end
 
     err = assert_raises(GraphQL::Schema::InvalidTypeError) {
-      schema = GraphQL::Schema.define(query: query_type)
+      schema = GraphQL::Schema.define(query: query_type, query_execution_strategy: DEFAULT_EXEC_STRATEGY)
       schema.types
     }
 

spec/graphql/introspection/introspection_query_spec.rb

@@ -24,6 +24,7 @@
 
      deep_schema = GraphQL::Schema.define do
        query query_type
+       query_execution_strategy DEFAULT_EXEC_STRATEGY
      end
 
      result = deep_schema.execute(query_string)

spec/graphql/query/context_spec.rb

@@ -17,7 +17,7 @@
       resolve ->(target, args, ctx) { ctx.query.class.name }
     end
   }}
-  let(:schema) { GraphQL::Schema.define(query: query_type, mutation: nil)}
+  let(:schema) { GraphQL::Schema.define(query: query_type, mutation: nil, query_execution_strategy: DEFAULT_EXEC_STRATEGY)}
   let(:result) { schema.execute(query_string, context: {"some_key" => "some value"})}
 
   describe "access to passed-in values" do

spec/graphql/query/executor_spec.rb

@@ -85,7 +85,7 @@
         end
       end
 
-      GraphQL::Schema.define(query: DummyQueryType, mutation: MutationType, resolve_type: :pass, id_from_object: :pass)
+      GraphQL::Schema.define(query: DummyQueryType, mutation: MutationType, resolve_type: :pass, id_from_object: :pass, query_execution_strategy: DEFAULT_EXEC_STRATEGY)
     }
     let(:variables) { nil }
     let(:query_string) { %|

spec/graphql/query/serial_execution/value_resolution_spec.rb

@@ -44,6 +44,7 @@
     GraphQL::Schema.define do
       query(query_root)
       orphan_types [some_object]
+      query_execution_strategy DEFAULT_EXEC_STRATEGY
       resolve_type ->(obj, ctx) do
         if obj.is_a?(Symbol)
           other_object

spec/graphql/schema/loader_spec.rb

@@ -111,6 +111,7 @@
       mutation: mutation_root,
       orphan_types: [audio_type, video_type],
       resolve_type: :pass,
+      query_execution_strategy: DEFAULT_EXEC_STRATEGY,
     )
   }