diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-08 09:09:43 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-08 09:09:43 +0000 |
commit | f5050253469fc0961c02deec0e698ad62bdd9de5 (patch) | |
tree | 30bbd8f8b556fd5b730f0123921138ee1d6bdaa2 /spec/services/merge_requests | |
parent | f6cdec670b9b757fc2225a2c6627ab79765e5b8a (diff) | |
download | gitlab-ce-f5050253469fc0961c02deec0e698ad62bdd9de5.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 | 15 |
1 files changed, 5 insertions, 10 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 4d87fa3e832..0cec1e7be22 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 @@ -8,10 +8,6 @@ describe MergeRequests::AddTodoWhenBuildFailsService do let(:sha) { '1234567890abcdef1234567890abcdef12345678' } let(:ref) { merge_request.source_branch } - let(:pipeline) do - create(:ci_pipeline, ref: ref, project: project, sha: sha) - end - let(:service) do described_class.new(project, user, commit_message: 'Awesome message') end @@ -19,12 +15,11 @@ describe MergeRequests::AddTodoWhenBuildFailsService do let(:todo_service) { spy('todo service') } let(:merge_request) do - create(:merge_request, merge_user: user, - source_branch: 'master', - target_branch: 'feature', - source_project: project, - target_project: project, - state: 'opened') + create(:merge_request, :with_detached_merge_request_pipeline, :opened, merge_user: user) + end + + let(:pipeline) do + merge_request.all_pipelines.take end before do |