Convert from GraphQL::Batch to BatchLoader

4 files changed, 8 insertions, 23 deletions

diff --git a/spec/graphql/gitlab_schema_spec.rb b/spec/graphql/gitlab_schema_spec.rb
index 3582f297866..070b851b109 100644
--- a/spec/graphql/gitlab_schema_spec.rb
+++ b/spec/graphql/gitlab_schema_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe GitlabSchema do
   it 'uses batch loading' do
-    expect(described_class.instrumenters[:multiplex]).to include(GraphQL::Batch::SetupMultiplex)
+    expect(field_instrumenters).to include(BatchLoader::GraphQL)
   end
 
   it 'enables the preload instrumenter' do
diff --git a/spec/graphql/loaders/full_path_loader_spec.rb b/spec/graphql/loaders/full_path_loader_spec.rb
index 2a473239550..2732dd8c9da 100644
--- a/spec/graphql/loaders/full_path_loader_spec.rb
+++ b/spec/graphql/loaders/full_path_loader_spec.rb
@@ -24,12 +24,6 @@ describe Loaders::FullPathLoader do
 
       expect(result).to be_nil
     end
-
-    it 'returns a promise' do
-      batch do
-        expect(resolve_project(project1.full_path)).to be_a(Promise)
-      end
-    end
   end
 
   def resolve_project(full_path)
diff --git a/spec/graphql/loaders/iid_loader_spec.rb b/spec/graphql/loaders/iid_loader_spec.rb
index 8a0c1f0791a..0a57d7c4ed4 100644
--- a/spec/graphql/loaders/iid_loader_spec.rb
+++ b/spec/graphql/loaders/iid_loader_spec.rb
@@ -50,12 +50,6 @@ describe Loaders::IidLoader do
 
       expect(result).to be_nil
     end
-
-    it 'returns a promise' do
-      batch do
-        expect(resolve_mr(full_path, iid_1)).to be_a(Promise)
-      end
-    end
   end
 
   def resolve_mr(full_path, iid)
diff --git a/spec/support/helpers/graphql_helpers.rb b/spec/support/helpers/graphql_helpers.rb
index 5bb2cf9dd9e..1eaa7603af0 100644
--- a/spec/support/helpers/graphql_helpers.rb
+++ b/spec/support/helpers/graphql_helpers.rb
@@ -4,20 +4,17 @@ module GraphqlHelpers
     kls[name].call(obj, args, ctx)
   end
 
-  # Runs a block inside a GraphQL::Batch wrapper
+  # Runs a block inside a BatchLoader::Executor wrapper
   def batch(max_queries: nil, &blk)
     wrapper = proc do
-      GraphQL::Batch.batch do
-        result = yield
-
-        if result.is_a?(Array)
-          Promise.all(result)
-        else
-          result
-        end
+      begin
+        BatchLoader::Executor.ensure_current
+        blk.call
+      ensure
+        BatchLoader::Executor.clear_current
       end
     end
-
+  
     if max_queries
       result = nil
       expect { result = wrapper.call }.not_to exceed_query_limit(max_queries)