diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-05-23 18:53:29 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-05-23 18:53:29 +0000 |
| commit | 6f4e977046974401a0d10120fd22d4f2f8814e45 (patch) | |
| tree | 05eca29b759112d38465d632f97bc31b42e207b0 /features | |
| parent | 2d67845d11f171e2ca1ddd2bf1cde3b2f7f16bbf (diff) | |
| parent | 921c2be44af6a5a2af2b6e17945f0301c8158214 (diff) | |
| download | gitlab-ce-6f4e977046974401a0d10120fd22d4f2f8814e45.tar.gz | |
Merge branch 'issue_32225' into 'master'
Add transient head_pipeline_of to pipeline factories
See merge request !11566
Diffstat (limited to 'features')
| -rw-r--r-- | features/steps/project/merge_requests.rb | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb index 8133760e619..caf36164891 100644 --- a/features/steps/project/merge_requests.rb +++ b/features/steps/project/merge_requests.rb @@ -556,8 +556,14 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps step '"Bug NS-05" has CI status' do project = merge_request.source_project project.enable_ci - pipeline = create :ci_pipeline, project: project, sha: merge_request.diff_head_sha, ref: merge_request.source_branch - merge_request.update(head_pipeline: pipeline) + + pipeline = + create(:ci_pipeline, + project: project, + sha: merge_request.diff_head_sha, + ref: merge_request.source_branch, + head_pipeline_of: merge_request) + create :ci_build, pipeline: pipeline end |