Upgrade GraphQL gem to 1.8.17

- Due to https://github.com/exAspArk/batch-loader/pull/32,
we  changed BatchLoader.for into BatchLoader::GraphQL.for
- since our results are wrapped in a BatchLoader::GraphQL,
calling `sync` during authorization is required to get real object
- `graphql` now has it's own authorization system.  Our
`authorized?` method conflicted and required renaming

5 files changed, 12 insertions, 12 deletions

diff --git a/spec/graphql/resolvers/group_resolver_spec.rb b/spec/graphql/resolvers/group_resolver_spec.rb
index 5eb9cd06d15..7dec9ac1aa5 100644
--- a/spec/graphql/resolvers/group_resolver_spec.rb
+++ b/spec/graphql/resolvers/group_resolver_spec.rb
@@ -12,7 +12,7 @@ describe Resolvers::GroupResolver do
     it 'batch-resolves groups by full path' do
       paths = [group1.full_path, group2.full_path]
 
-      result = batch(max_queries: 1) do
+      result = batch_sync(max_queries: 1) do
         paths.map { |path| resolve_group(path) }
       end
 
@@ -20,7 +20,7 @@ describe Resolvers::GroupResolver do
     end
 
     it 'resolves an unknown full_path to nil' do
-      result = batch { resolve_group('unknown/project') }
+      result = batch_sync { resolve_group('unknown/project') }
 
       expect(result).to be_nil
     end
diff --git a/spec/graphql/resolvers/issues_resolver_spec.rb b/spec/graphql/resolvers/issues_resolver_spec.rb
index 798fe00de97..d122c081069 100644
--- a/spec/graphql/resolvers/issues_resolver_spec.rb
+++ b/spec/graphql/resolvers/issues_resolver_spec.rb
@@ -110,7 +110,7 @@ describe Resolvers::IssuesResolver do
 
   context "when passing a non existent, batch loaded project" do
     let(:project) do
-      BatchLoader.for("non-existent-path").batch do |_fake_paths, loader, _|
+      BatchLoader::GraphQL.for("non-existent-path").batch do |_fake_paths, loader, _|
         loader.call("non-existent-path", nil)
       end
     end
diff --git a/spec/graphql/resolvers/merge_requests_resolver_spec.rb b/spec/graphql/resolvers/merge_requests_resolver_spec.rb
index ab3c426b2cd..97b8e5ed41c 100644
--- a/spec/graphql/resolvers/merge_requests_resolver_spec.rb
+++ b/spec/graphql/resolvers/merge_requests_resolver_spec.rb
@@ -17,7 +17,7 @@ describe Resolvers::MergeRequestsResolver do
 
   describe '#resolve' do
     it 'batch-resolves by target project full path and individual IID' do
-      result = batch(max_queries: 2) do
+      result = batch_sync(max_queries: 2) do
         resolve_mr(project, iid: iid_1) + resolve_mr(project, iid: iid_2)
       end
 
@@ -25,7 +25,7 @@ describe Resolvers::MergeRequestsResolver do
     end
 
     it 'batch-resolves by target project full path and IIDS' do
-      result = batch(max_queries: 2) do
+      result = batch_sync(max_queries: 2) do
         resolve_mr(project, iids: [iid_1, iid_2])
       end
 
@@ -33,7 +33,7 @@ describe Resolvers::MergeRequestsResolver do
     end
 
     it 'can batch-resolve merge requests from different projects' do
-      result = batch(max_queries: 3) do
+      result = batch_sync(max_queries: 3) do
         resolve_mr(project, iid: iid_1) +
           resolve_mr(project, iid: iid_2) +
           resolve_mr(other_project, iid: other_iid)
@@ -43,13 +43,13 @@ describe Resolvers::MergeRequestsResolver do
     end
 
     it 'resolves an unknown iid to be empty' do
-      result = batch { resolve_mr(project, iid: -1) }
+      result = batch_sync { resolve_mr(project, iid: -1) }
 
-      expect(result).to be_empty
+      expect(result.compact).to be_empty
     end
 
     it 'resolves empty iids to be empty' do
-      result = batch { resolve_mr(project, iids: []) }
+      result = batch_sync { resolve_mr(project, iids: []) }
 
       expect(result).to be_empty
     end
diff --git a/spec/graphql/resolvers/namespace_projects_resolver_spec.rb b/spec/graphql/resolvers/namespace_projects_resolver_spec.rb
index 47591445fc0..639cc69650b 100644
--- a/spec/graphql/resolvers/namespace_projects_resolver_spec.rb
+++ b/spec/graphql/resolvers/namespace_projects_resolver_spec.rb
@@ -46,7 +46,7 @@ describe Resolvers::NamespaceProjectsResolver do
 
   context "when passing a non existent, batch loaded namespace" do
     let(:namespace) do
-      BatchLoader.for("non-existent-path").batch do |_fake_paths, loader, _|
+      BatchLoader::GraphQL.for("non-existent-path").batch do |_fake_paths, loader, _|
         loader.call("non-existent-path", nil)
       end
     end
diff --git a/spec/graphql/resolvers/project_resolver_spec.rb b/spec/graphql/resolvers/project_resolver_spec.rb
index 4fdbb3aa43e..d0fc2957909 100644
--- a/spec/graphql/resolvers/project_resolver_spec.rb
+++ b/spec/graphql/resolvers/project_resolver_spec.rb
@@ -12,7 +12,7 @@ describe Resolvers::ProjectResolver do
     it 'batch-resolves projects by full path' do
       paths = [project1.full_path, project2.full_path]
 
-      result = batch(max_queries: 1) do
+      result = batch_sync(max_queries: 1) do
         paths.map { |path| resolve_project(path) }
       end
 
@@ -20,7 +20,7 @@ describe Resolvers::ProjectResolver do
     end
 
     it 'resolves an unknown full_path to nil' do
-      result = batch { resolve_project('unknown/project') }
+      result = batch_sync { resolve_project('unknown/project') }
 
       expect(result).to be_nil
     end