summaryrefslogtreecommitdiff
path: root/spec/services/merge_requests
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-10-06 12:31:39 +0200
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-10-06 12:31:39 +0200
commitcd58410811564130e6975c62fe77d2c9fccce46f (patch)
treea426ccc802eb4d8b775ca7e348730d61014c3e8e /spec/services/merge_requests
parent9824a69c8a4028b757a3d13d7ed4251589d20589 (diff)
downloadgitlab-ce-cd58410811564130e6975c62fe77d2c9fccce46f.tar.gz
Remove support for branch-less builds in MWBS
See !6675#note_16580143
Diffstat (limited to 'spec/services/merge_requests')
-rw-r--r--spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb13
1 files changed, 1 insertions, 12 deletions
diff --git a/spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb b/spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb
index df8f8b61df5..03345ed9c15 100644
--- a/spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb
+++ b/spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb
@@ -97,20 +97,9 @@ describe MergeRequests::MergeWhenBuildSucceedsService do
expect(MergeWorker).not_to receive(:perform_async)
service.trigger(unrelated_pipeline)
end
-
- it 'discovers branches and merges all merge requests when status is success' do
- allow(project.repository).to receive(:branch_names_contains).
- with(commit_status.sha).and_return([mr_merge_if_green_enabled.source_branch])
- allow(pipeline).to receive(:success?).and_return(true)
- allow_any_instance_of(MergeRequest).to receive(:pipeline).and_return(pipeline)
- allow(pipeline).to receive(:success?).and_return(true)
-
- expect(MergeWorker).to receive(:perform_async)
- service.trigger(commit_status)
- end
end
- context 'properly handles multiple stages' do
+ context 'when there are multiple stages in the pipeline' do
let(:ref) { mr_merge_if_green_enabled.source_branch }
let!(:build) { create(:ci_build, :created, pipeline: pipeline, ref: ref, name: 'build', stage: 'build') }
let!(:test) { create(:ci_build, :created, pipeline: pipeline, ref: ref, name: 'test', stage: 'test') }