diff options
author | Felipe Artur <felipefac@gmail.com> | 2017-05-19 17:51:07 -0300 |
---|---|---|
committer | Felipe Artur <felipefac@gmail.com> | 2017-05-22 17:06:45 -0300 |
commit | 921c2be44af6a5a2af2b6e17945f0301c8158214 (patch) | |
tree | 1f2dc10b8661d6f6c95cd97433f1faf6d67b6852 /spec/controllers | |
parent | 9d29eb7e292067fb980b4ca97fc6c3edac1dccec (diff) | |
download | gitlab-ce-921c2be44af6a5a2af2b6e17945f0301c8158214.tar.gz |
Add transient head_pipeline_of to pipeline factoriesissue_32225
Diffstat (limited to 'spec/controllers')
-rw-r--r-- | spec/controllers/projects/merge_requests_controller_spec.rb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb index 0b3492a8fed..86ca74a898a 100644 --- a/spec/controllers/projects/merge_requests_controller_spec.rb +++ b/spec/controllers/projects/merge_requests_controller_spec.rb @@ -345,8 +345,7 @@ describe Projects::MergeRequestsController do end before do - pipeline = create(:ci_empty_pipeline, project: project, sha: merge_request.diff_head_sha, ref: merge_request.source_branch) - merge_request.update(head_pipeline: pipeline) + create(:ci_empty_pipeline, project: project, sha: merge_request.diff_head_sha, ref: merge_request.source_branch, head_pipeline_of: merge_request) end it 'returns :merge_when_pipeline_succeeds' do @@ -1161,13 +1160,13 @@ describe Projects::MergeRequestsController do let!(:pipeline) do create(:ci_pipeline, project: merge_request.source_project, ref: merge_request.source_branch, - sha: merge_request.diff_head_sha) + sha: merge_request.diff_head_sha, + head_pipeline_of: merge_request) end let(:status) { pipeline.detailed_status(double('user')) } before do - merge_request.update(head_pipeline: pipeline) get_pipeline_status end |