diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-01-07 16:37:33 +0300 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-01-07 16:37:33 +0300 |
| commit | cd11ede9ccdb05ff3e91bb4507af1ff063722608 (patch) | |
| tree | fd27408bfa0afc1c11e7b6f34496815304291572 /spec/services/ci | |
| parent | 75e6561684415b2fffb47a6293ba787c379b84b7 (diff) | |
| parent | 4ab0b33db6f328fc68394fd3af992052f883401e (diff) | |
Merge branch 'user-update-head-pipeline-worker-2' into 'master'
Refactor the logic of updating head pipelines for merge requests
See merge request gitlab-org/gitlab-ce!23502
Diffstat (limited to 'spec/services/ci')
| -rw-r--r-- | spec/services/ci/create_pipeline_service_spec.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/services/ci/create_pipeline_service_spec.rb b/spec/services/ci/create_pipeline_service_spec.rb index 87b60387c52..8497e90bd8b 100644 --- a/spec/services/ci/create_pipeline_service_spec.rb +++ b/spec/services/ci/create_pipeline_service_spec.rb @@ -143,7 +143,8 @@ describe Ci::CreatePipelineService do target_branch: "branch_1", source_project: project) - allow_any_instance_of(Ci::Pipeline).to receive(:latest?).and_return(false) + allow_any_instance_of(MergeRequest) + .to receive(:find_actual_head_pipeline) { } execute_service |