diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-13 12:06:22 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-13 12:06:22 +0000 |
| commit | 4e516dbff9767a35677fdc4a6e39005b4b564376 (patch) | |
| tree | 7c650b30777b8e7f72cafb186e9446a50d3fa3be /spec/services/merge_requests | |
| parent | 4f01ac5ba0bf72427ed4fef9b229d056dbb60e89 (diff) | |
| download | gitlab-ce-4e516dbff9767a35677fdc4a6e39005b4b564376.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/services/merge_requests')
| -rw-r--r-- | spec/services/merge_requests/add_todo_when_build_fails_service_spec.rb | 4 | ||||
| -rw-r--r-- | spec/services/merge_requests/update_service_spec.rb | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/spec/services/merge_requests/add_todo_when_build_fails_service_spec.rb b/spec/services/merge_requests/add_todo_when_build_fails_service_spec.rb index f26b67f902d..203048984a1 100644 --- a/spec/services/merge_requests/add_todo_when_build_fails_service_spec.rb +++ b/spec/services/merge_requests/add_todo_when_build_fails_service_spec.rb @@ -10,9 +10,7 @@ describe MergeRequests::AddTodoWhenBuildFailsService do let(:ref) { merge_request.source_branch } let(:pipeline) do - create(:ci_pipeline_with_one_job, ref: ref, - project: project, - sha: sha) + create(:ci_pipeline, ref: ref, project: project, sha: sha) end let(:service) do diff --git a/spec/services/merge_requests/update_service_spec.rb b/spec/services/merge_requests/update_service_spec.rb index 741420d76a7..0cfcae1b006 100644 --- a/spec/services/merge_requests/update_service_spec.rb +++ b/spec/services/merge_requests/update_service_spec.rb @@ -190,7 +190,7 @@ describe MergeRequests::UpdateService, :mailer do context 'with finished pipeline' do before do - create(:ci_pipeline_with_one_job, + create(:ci_pipeline, project: project, ref: merge_request.source_branch, sha: merge_request.diff_head_sha, @@ -212,7 +212,7 @@ describe MergeRequests::UpdateService, :mailer do before do service_mock = double create( - :ci_pipeline_with_one_job, + :ci_pipeline, project: project, ref: merge_request.source_branch, sha: merge_request.diff_head_sha, |