diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 11:59:07 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 11:59:07 +0000 |
commit | 8b573c94895dc0ac0e1d9d59cf3e8745e8b539ca (patch) | |
tree | 544930fb309b30317ae9797a9683768705d664c4 /spec/graphql/resolvers/merge_requests_resolver_spec.rb | |
parent | 4b1de649d0168371549608993deac953eb692019 (diff) | |
download | gitlab-ce-8b573c94895dc0ac0e1d9d59cf3e8745e8b539ca.tar.gz |
Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42
Diffstat (limited to 'spec/graphql/resolvers/merge_requests_resolver_spec.rb')
-rw-r--r-- | spec/graphql/resolvers/merge_requests_resolver_spec.rb | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/spec/graphql/resolvers/merge_requests_resolver_spec.rb b/spec/graphql/resolvers/merge_requests_resolver_spec.rb index 3a3393a185c..63fbd04848d 100644 --- a/spec/graphql/resolvers/merge_requests_resolver_spec.rb +++ b/spec/graphql/resolvers/merge_requests_resolver_spec.rb @@ -75,9 +75,9 @@ RSpec.describe Resolvers::MergeRequestsResolver do it 'can batch-resolve merge requests from different projects' do # 2 queries for project_authorizations, and 2 for merge_requests result = batch_sync(max_queries: queries_per_project * 2) do - resolve_mr(project, iids: iid_1) + - resolve_mr(project, iids: iid_2) + - resolve_mr(other_project, iids: other_iid) + resolve_mr(project, iids: [iid_1]) + + resolve_mr(project, iids: [iid_2]) + + resolve_mr(other_project, iids: [other_iid]) end expect(result).to contain_exactly(merge_request_1, merge_request_2, other_merge_request) @@ -110,7 +110,7 @@ RSpec.describe Resolvers::MergeRequestsResolver do context 'by source branches' do it 'takes one argument' do - result = resolve_mr(project, source_branch: [merge_request_3.source_branch]) + result = resolve_mr(project, source_branches: [merge_request_3.source_branch]) expect(result).to contain_exactly(merge_request_3) end @@ -118,7 +118,7 @@ RSpec.describe Resolvers::MergeRequestsResolver do it 'takes more than one argument' do mrs = [merge_request_3, merge_request_4] branches = mrs.map(&:source_branch) - result = resolve_mr(project, source_branch: branches ) + result = resolve_mr(project, source_branches: branches ) expect(result).to match_array(mrs) end @@ -126,7 +126,7 @@ RSpec.describe Resolvers::MergeRequestsResolver do context 'by target branches' do it 'takes one argument' do - result = resolve_mr(project, target_branch: [merge_request_3.target_branch]) + result = resolve_mr(project, target_branches: [merge_request_3.target_branch]) expect(result).to contain_exactly(merge_request_3) end @@ -134,7 +134,7 @@ RSpec.describe Resolvers::MergeRequestsResolver do it 'takes more than one argument' do mrs = [merge_request_3, merge_request_4] branches = mrs.map(&:target_branch) - result = resolve_mr(project, target_branch: branches ) + result = resolve_mr(project, target_branches: branches ) expect(result.compact).to match_array(mrs) end @@ -153,13 +153,13 @@ RSpec.describe Resolvers::MergeRequestsResolver do let_it_be(:with_label) { create(:labeled_merge_request, :closed, labels: [label], **common_attrs) } it 'takes one argument' do - result = resolve_mr(project, label_name: [label.title]) + result = resolve_mr(project, labels: [label.title]) expect(result).to contain_exactly(merge_request_6, with_label) end it 'takes multiple arguments, with semantics of ALL MUST MATCH' do - result = resolve_mr(project, label_name: merge_request_6.labels.map(&:title)) + result = resolve_mr(project, labels: merge_request_6.labels.map(&:title)) expect(result).to contain_exactly(merge_request_6) end @@ -201,7 +201,7 @@ RSpec.describe Resolvers::MergeRequestsResolver do it 'requires all filters' do create(:merge_request, :closed, source_project: project, target_project: project, source_branch: merge_request_4.source_branch) - result = resolve_mr(project, source_branch: [merge_request_4.source_branch], state: 'locked') + result = resolve_mr(project, source_branches: [merge_request_4.source_branch], state: 'locked') expect(result.compact).to contain_exactly(merge_request_4) end @@ -236,7 +236,7 @@ RSpec.describe Resolvers::MergeRequestsResolver do end def resolve_mr_single(project, iid) - resolve_mr(project, resolver: described_class.single, iids: iid) + resolve_mr(project, resolver: described_class.single, iid: iid.to_s) end def resolve_mr(project, resolver: described_class, user: current_user, **args) |