Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-09 21:07:52 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-09 21:07:52 +0300
commit6c15c18fa455502bf0b80316390eefde40d42a8a (patch)
treeb42af022a747fd580a09f36b0e60a9f53ed7b25c /spec/requests/api
parent263f926c770163788f78af03ab69689c94f57360 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/requests/api')
-rw-r--r--spec/requests/api/jobs_spec.rb2
-rw-r--r--spec/requests/api/pipelines_spec.rb4
2 files changed, 2 insertions, 4 deletions
diff --git a/spec/requests/api/jobs_spec.rb b/spec/requests/api/jobs_spec.rb
index 82bf607b911..1e1099ebcb6 100644
--- a/spec/requests/api/jobs_spec.rb
+++ b/spec/requests/api/jobs_spec.rb
@@ -244,7 +244,7 @@ describe API::Jobs do
get api("/projects/#{project.id}/pipelines/#{pipeline.id}/jobs", api_user), params: query
end.count
- 3.times { create(:ci_build, :trace_artifact, :artifacts, :test_reports, pipeline: pipeline) }
+ create_list(:ci_build, 3, :trace_artifact, :artifacts, :test_reports, pipeline: pipeline)
expect do
get api("/projects/#{project.id}/pipelines/#{pipeline.id}/jobs", api_user), params: query
diff --git a/spec/requests/api/pipelines_spec.rb b/spec/requests/api/pipelines_spec.rb
index a9d570b5696..75e3013d362 100644
--- a/spec/requests/api/pipelines_spec.rb
+++ b/spec/requests/api/pipelines_spec.rb
@@ -254,9 +254,7 @@ describe API::Pipelines do
context 'when order_by and sort are specified' do
context 'when order_by user_id' do
before do
- 3.times do
- create(:ci_pipeline, project: project, user: create(:user))
- end
+ create_list(:ci_pipeline, 3, project: project, user: create(:user))
end
context 'when sort parameter is valid' do