summaryrefslogtreecommitdiff
path: root/spec/requests/api/graphql/project/merge_request
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-02-18 10:34:06 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-02-18 10:34:06 +0000
commit859a6fb938bb9ee2a317c46dfa4fcc1af49608f0 (patch)
treed7f2700abe6b4ffcb2dcfc80631b2d87d0609239 /spec/requests/api/graphql/project/merge_request
parent446d496a6d000c73a304be52587cd9bbc7493136 (diff)
downloadgitlab-ce-859a6fb938bb9ee2a317c46dfa4fcc1af49608f0.tar.gz
Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42
Diffstat (limited to 'spec/requests/api/graphql/project/merge_request')
-rw-r--r--spec/requests/api/graphql/project/merge_request/pipelines_spec.rb8
1 files changed, 5 insertions, 3 deletions
diff --git a/spec/requests/api/graphql/project/merge_request/pipelines_spec.rb b/spec/requests/api/graphql/project/merge_request/pipelines_spec.rb
index ac0b18a37d6..70c5bda35e1 100644
--- a/spec/requests/api/graphql/project/merge_request/pipelines_spec.rb
+++ b/spec/requests/api/graphql/project/merge_request/pipelines_spec.rb
@@ -8,9 +8,11 @@ RSpec.describe 'Query.project.mergeRequests.pipelines' do
let_it_be(:project) { create(:project, :public, :repository) }
let_it_be(:author) { create(:user) }
let_it_be(:merge_requests) do
- %i[with_diffs with_image_diffs conflict].map do |trait|
- create(:merge_request, trait, author: author, source_project: project)
- end
+ [
+ create(:merge_request, author: author, source_project: project),
+ create(:merge_request, :with_image_diffs, author: author, source_project: project),
+ create(:merge_request, :conflict, author: author, source_project: project)
+ ]
end
describe '.count' do