Commit 7411c4c5 authored by Heinrich Lee Yu's avatar Heinrich Lee Yu

Merge branch 'pl-ruby-kwargs-warnings-spec-mr-resolver' into 'master'

Fix kwargs deprecation warnings in merge request resolver specs

See merge request gitlab-org/gitlab!47533
parents d25167d4 03b9c26b
...@@ -34,13 +34,13 @@ RSpec.describe Resolvers::MergeRequestsResolver do ...@@ -34,13 +34,13 @@ RSpec.describe Resolvers::MergeRequestsResolver do
context 'no arguments' do context 'no arguments' do
it 'returns all merge requests' do it 'returns all merge requests' do
result = resolve_mr(project, {}) result = resolve_mr(project)
expect(result).to contain_exactly(merge_request_1, merge_request_2, merge_request_3, merge_request_4, merge_request_5, merge_request_6, merge_request_with_milestone) expect(result).to contain_exactly(merge_request_1, merge_request_2, merge_request_3, merge_request_4, merge_request_5, merge_request_6, merge_request_with_milestone)
end end
it 'returns only merge requests that the current user can see' do it 'returns only merge requests that the current user can see' do
result = resolve_mr(project, {}, user: build(:user)) result = resolve_mr(project, user: build(:user))
expect(result).to be_empty expect(result).to be_empty
end end
...@@ -236,10 +236,10 @@ RSpec.describe Resolvers::MergeRequestsResolver do ...@@ -236,10 +236,10 @@ RSpec.describe Resolvers::MergeRequestsResolver do
end end
def resolve_mr_single(project, iid) def resolve_mr_single(project, iid)
resolve_mr(project, { iids: iid }, resolver: described_class.single) resolve_mr(project, resolver: described_class.single, iids: iid)
end end
def resolve_mr(project, args, resolver: described_class, user: current_user) def resolve_mr(project, resolver: described_class, user: current_user, **args)
resolve(resolver, obj: project, args: args, ctx: { current_user: user }) resolve(resolver, obj: project, args: args, ctx: { current_user: user })
end end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment