summaryrefslogtreecommitdiff
path: root/spec/requests/api/merge_requests_spec.rb
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-06-03 16:22:26 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2016-06-03 16:22:26 +0200
commit20c7144ed20bad499b878425d5fbab408ad066b5 (patch)
tree8b25261fa12fc36abca7639664329724d2a4302d /spec/requests/api/merge_requests_spec.rb
parent8ce1896b46f893de62528e44172be8c128b27c9b (diff)
downloadgitlab-ce-20c7144ed20bad499b878425d5fbab408ad066b5.tar.gz
Rename all `[ci_]commit` to `[ci_]pipeline` in specs and features
Diffstat (limited to 'spec/requests/api/merge_requests_spec.rb')
-rw-r--r--spec/requests/api/merge_requests_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb
index 04cf15641d0..33fbdde768f 100644
--- a/spec/requests/api/merge_requests_spec.rb
+++ b/spec/requests/api/merge_requests_spec.rb
@@ -388,7 +388,7 @@ describe API::API, api: true do
end
describe "PUT /projects/:id/merge_requests/:merge_request_id/merge" do
- let(:pipeline) { create(:ci_commit_without_jobs) }
+ let(:pipeline) { create(:ci_pipeline_without_jobs) }
it "should return merge_request in case of success" do
put api("/projects/#{project.id}/merge_requests/#{merge_request.id}/merge", user)
@@ -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