diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-11-28 11:13:32 +0100 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-11-29 14:12:49 +0100 |
| commit | a49e9949c6bc474c8bfd4016d9c6c3b59776772f (patch) | |
| tree | fd8efa2f374885a1c12c7eb0e2c0224de3727a24 /spec/requests/api/merge_requests_spec.rb | |
| parent | b8f9949a70005978e83a3aaffbe0836c75d24b74 (diff) | |
| download | gitlab-ce-a49e9949c6bc474c8bfd4016d9c6c3b59776772f.tar.gz | |
Rename `MergeRequest#pipeline` to `head_pipeline`fix/rename-merge-request-head-pipeline
Diffstat (limited to 'spec/requests/api/merge_requests_spec.rb')
| -rw-r--r-- | spec/requests/api/merge_requests_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb index 3ecf3eea5f5..edc985b765b 100644 --- a/spec/requests/api/merge_requests_spec.rb +++ b/spec/requests/api/merge_requests_spec.rb @@ -466,7 +466,7 @@ describe API::API, api: true do end it "enables merge when build succeeds if the ci is active" do - allow_any_instance_of(MergeRequest).to receive(:pipeline).and_return(pipeline) + allow_any_instance_of(MergeRequest).to receive(:head_pipeline).and_return(pipeline) allow(pipeline).to receive(:active?).and_return(true) put api("/projects/#{project.id}/merge_requests/#{merge_request.id}/merge", user), merge_when_build_succeeds: true |