summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2019-02-14 22:57:09 +0800
committerLin Jen-Shin <godfat@godfat.org>2019-02-14 22:57:34 +0800
commitf80f6bbcdc7f18d9154604602f3750abb0292020 (patch)
treea24e6388eb61f18657752cdd02b8bb2e723dfe7e
parent50491d324135f14e817d7de9d825b9ce4dacc5ef (diff)
downloadgitlab-ce-56485-implement-graphql-mergerequestsresolver.tar.gz
Use a block and move setup to example directly56485-implement-graphql-mergerequestsresolver
-rw-r--r--app/graphql/resolvers/merge_requests_resolver.rb2
-rw-r--r--spec/requests/api/graphql/project/issues_spec.rb4
2 files changed, 2 insertions, 4 deletions
diff --git a/app/graphql/resolvers/merge_requests_resolver.rb b/app/graphql/resolvers/merge_requests_resolver.rb
index 0b394386f97..90795c797ac 100644
--- a/app/graphql/resolvers/merge_requests_resolver.rb
+++ b/app/graphql/resolvers/merge_requests_resolver.rb
@@ -19,7 +19,7 @@ module Resolvers
args[:iids] ||= [args[:iid]].compact
- args[:iids].map(&method(:batch_load))
+ args[:iids].map { |iid| batch_load(iid) }
.select(&:itself) # .compact doesn't work on BatchLoader
end
diff --git a/spec/requests/api/graphql/project/issues_spec.rb b/spec/requests/api/graphql/project/issues_spec.rb
index 1e3f11dc4e1..c2934430821 100644
--- a/spec/requests/api/graphql/project/issues_spec.rb
+++ b/spec/requests/api/graphql/project/issues_spec.rb
@@ -75,11 +75,9 @@ describe 'getting an issue list for a project' do
end
context 'when the user can see confidential issues' do
- before do
+ it 'returns issues with confidential issues' do
project.add_developer(current_user)
- end
- it 'returns issues with confidential issues' do
post_graphql(query, current_user: current_user)
expect(issues_data.size).to eq(3)