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 /spec/lib/gitlab | |
| 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 'spec/lib/gitlab')
| -rw-r--r-- | spec/lib/gitlab/cycle_analytics/events_spec.rb | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/spec/lib/gitlab/cycle_analytics/events_spec.rb b/spec/lib/gitlab/cycle_analytics/events_spec.rb index 3610a0354e8..a1b3fe8509e 100644 --- a/spec/lib/gitlab/cycle_analytics/events_spec.rb +++ b/spec/lib/gitlab/cycle_analytics/events_spec.rb @@ -126,12 +126,11 @@ describe 'cycle analytics events' do create(:ci_pipeline, ref: merge_request.source_branch, sha: merge_request.diff_head_sha, - project: context.project) + project: context.project, + head_pipeline_of: merge_request) end before do - merge_request.update(head_pipeline: pipeline) - create(:ci_build, pipeline: pipeline, status: :success, author: user) create(:ci_build, pipeline: pipeline, status: :success, author: user) @@ -224,12 +223,11 @@ describe 'cycle analytics events' do create(:ci_pipeline, ref: merge_request.source_branch, sha: merge_request.diff_head_sha, - project: context.project) + project: context.project, + head_pipeline_of: merge_request) end before do - merge_request.update(head_pipeline: pipeline) - create(:ci_build, pipeline: pipeline, status: :success, author: user) create(:ci_build, pipeline: pipeline, status: :success, author: user) |