diff options
| author | Felipe Artur <felipefac@gmail.com> | 2017-03-17 19:14:27 -0300 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2017-05-08 11:24:55 -0300 |
| commit | 4ae411ff40352ec21bd10f859b7f3f9f85a7aee6 (patch) | |
| tree | c7f38b9bc9a9fb826cf88de15fb61054f5354cab /spec | |
| parent | 11ff9fc6a9837cd5defa0325b5057a5a3d84634c (diff) | |
| download | gitlab-ce-4ae411ff40352ec21bd10f859b7f3f9f85a7aee6.tar.gz | |
Preloads head pipeline for each merge request
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/lib/gitlab/import_export/safe_model_attributes.yml | 1 | ||||
| -rw-r--r-- | spec/services/ci/create_pipeline_service_spec.rb | 12 |
2 files changed, 13 insertions, 0 deletions
diff --git a/spec/lib/gitlab/import_export/safe_model_attributes.yml b/spec/lib/gitlab/import_export/safe_model_attributes.yml index 3af2a172e6d..d2ceb1cf9ae 100644 --- a/spec/lib/gitlab/import_export/safe_model_attributes.yml +++ b/spec/lib/gitlab/import_export/safe_model_attributes.yml @@ -158,6 +158,7 @@ MergeRequest: - time_estimate - last_edited_at - last_edited_by_id +- head_pipeline_id MergeRequestDiff: - id - state diff --git a/spec/services/ci/create_pipeline_service_spec.rb b/spec/services/ci/create_pipeline_service_spec.rb index fa5014cee07..f2ed66b5e8e 100644 --- a/spec/services/ci/create_pipeline_service_spec.rb +++ b/spec/services/ci/create_pipeline_service_spec.rb @@ -34,6 +34,18 @@ describe Ci::CreatePipelineService, services: true do it { expect(pipeline).to have_attributes(status: 'pending') } it { expect(pipeline.builds.first).to be_kind_of(Ci::Build) } + it 'updates head pipeline of each merge request' do + merge_request_1 = create(:merge_request, source_branch: 'master', target_branch: "branch_1", source_project: project) + merge_request_2 = create(:merge_request, source_branch: 'master', target_branch: "branch_2", source_project: project) + merge_request_3 = create(:merge_request, source_branch: 'other_branch', target_branch: "branch_2", source_project: project) + + head_pipeline = pipeline + + expect(merge_request_1.reload.head_pipeline).to eq(head_pipeline) + expect(merge_request_2.reload.head_pipeline).to eq(head_pipeline) + expect(merge_request_3.reload.head_pipeline).to be_nil + end + context 'auto-cancel enabled' do before do project.update(auto_cancel_pending_pipelines: 'enabled') |