diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-06 12:19:54 +0300 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-06 12:19:54 +0300 |
| commit | 9614c52266fd7009c1dd2960564d4f65b1a12f80 (patch) | |
| tree | 533b513e76361e52237905491a30feaa38acddce /spec/requests/api | |
| parent | bf2bd2373d9179616436990b483aec52fcfe0f8e (diff) | |
Fix tests offenses: use `pipeline` of Ci::Build and rename views
Diffstat (limited to 'spec/requests/api')
| -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 04cf15641d0..03bc8b70551 100644 --- a/spec/requests/api/merge_requests_spec.rb +++ b/spec/requests/api/merge_requests_spec.rb @@ -443,7 +443,7 @@ describe API::API, api: true do it "enables merge when build succeeds if the ci is active" do allow_any_instance_of(MergeRequest).to receive(:pipeline).and_return(pipeline) - allow(ci_commit).to receive(:active?).and_return(true) + 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 |