diff options
| author | Felipe Artur <felipefac@gmail.com> | 2017-05-19 23:51:07 +0300 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2017-05-22 23:06:45 +0300 |
| commit | 921c2be44af6a5a2af2b6e17945f0301c8158214 (patch) | |
| tree | 1f2dc10b8661d6f6c95cd97433f1faf6d67b6852 /spec/features/merge_requests/merge_when_pipeline_succeeds_spec.rb | |
| parent | 9d29eb7e292067fb980b4ca97fc6c3edac1dccec (diff) | |
Add transient head_pipeline_of to pipeline factories
Diffstat (limited to 'spec/features/merge_requests/merge_when_pipeline_succeeds_spec.rb')
| -rw-r--r-- | spec/features/merge_requests/merge_when_pipeline_succeeds_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/features/merge_requests/merge_when_pipeline_succeeds_spec.rb b/spec/features/merge_requests/merge_when_pipeline_succeeds_spec.rb index 11b6f0c0a64..e08721b4724 100644 --- a/spec/features/merge_requests/merge_when_pipeline_succeeds_spec.rb +++ b/spec/features/merge_requests/merge_when_pipeline_succeeds_spec.rb @@ -13,12 +13,12 @@ feature 'Merge When Pipeline Succeeds', :feature, :js do let(:pipeline) do create(:ci_pipeline, project: project, sha: merge_request.diff_head_sha, - ref: merge_request.source_branch) + ref: merge_request.source_branch, + head_pipeline_of: merge_request) end before do project.add_master(user) - merge_request.update(head_pipeline_id: pipeline.id) end context 'when there is active pipeline for merge request' do |