Add field mergeRequests for project in GraphQL

And fix the tests so that it won't run into circular paths.

1 files changed, 6 insertions, 4 deletions

diff --git a/spec/graphql/resolvers/merge_request_resolver_spec.rb b/spec/graphql/resolvers/merge_requests_resolver_spec.rb
index 73993b3a039..782a530e6f7 100644
--- a/spec/graphql/resolvers/merge_request_resolver_spec.rb
+++ b/spec/graphql/resolvers/merge_requests_resolver_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Resolvers::MergeRequestResolver do
+describe Resolvers::MergeRequestsResolver do
   include GraphqlHelpers
 
   set(:project) { create(:project, :repository) }
@@ -18,7 +18,7 @@ describe Resolvers::MergeRequestResolver do
   describe '#resolve' do
     it 'batch-resolves merge requests by target project full path and IID' do
       result = batch(max_queries: 2) do
-        [resolve_mr(project, iid_1), resolve_mr(project, iid_2)]
+        resolve_mr(project, iid_1) + resolve_mr(project, iid_2)
       end
 
       expect(result).to contain_exactly(merge_request_1, merge_request_2)
@@ -26,7 +26,9 @@ describe Resolvers::MergeRequestResolver do
 
     it 'can batch-resolve merge requests from different projects' do
       result = batch(max_queries: 3) do
-        [resolve_mr(project, iid_1), resolve_mr(project, iid_2), resolve_mr(other_project, other_iid)]
+        resolve_mr(project, iid_1) +
+          resolve_mr(project, iid_2) +
+          resolve_mr(other_project, other_iid)
       end
 
       expect(result).to contain_exactly(merge_request_1, merge_request_2, other_merge_request)
@@ -35,7 +37,7 @@ describe Resolvers::MergeRequestResolver do
     it 'resolves an unknown iid to nil' do
       result = batch { resolve_mr(project, -1) }
 
-      expect(result).to be_nil
+      expect(result).to be_empty
     end
   end