Commit 9eedd6f9 authored by Grzegorz Bizon's avatar Grzegorz Bizon

Improve desc for pipeline integration spec in MWBS

parent df404f55
...@@ -98,7 +98,26 @@ describe MergeRequests::MergeWhenBuildSucceedsService do ...@@ -98,7 +98,26 @@ describe MergeRequests::MergeWhenBuildSucceedsService do
service.trigger(unrelated_pipeline) service.trigger(unrelated_pipeline)
end end
end end
end
describe "#cancel" do
before do
service.cancel(mr_merge_if_green_enabled)
end
it "resets all the merge_when_build_succeeds params" do
expect(mr_merge_if_green_enabled.merge_when_build_succeeds).to be_falsey
expect(mr_merge_if_green_enabled.merge_params).to eq({})
expect(mr_merge_if_green_enabled.merge_user).to be nil
end
it 'Posts a system note' do
note = mr_merge_if_green_enabled.notes.last
expect(note.note).to include 'Canceled the automatic merge'
end
end
describe 'pipeline integration' do
context 'when there are multiple stages in the pipeline' do context 'when there are multiple stages in the pipeline' do
let(:ref) { mr_merge_if_green_enabled.source_branch } let(:ref) { mr_merge_if_green_enabled.source_branch }
let(:sha) { project.commit(ref).id } let(:sha) { project.commit(ref).id }
...@@ -139,21 +158,4 @@ describe MergeRequests::MergeWhenBuildSucceedsService do ...@@ -139,21 +158,4 @@ describe MergeRequests::MergeWhenBuildSucceedsService do
end end
end end
end end
describe "#cancel" do
before do
service.cancel(mr_merge_if_green_enabled)
end
it "resets all the merge_when_build_succeeds params" do
expect(mr_merge_if_green_enabled.merge_when_build_succeeds).to be_falsey
expect(mr_merge_if_green_enabled.merge_params).to eq({})
expect(mr_merge_if_green_enabled.merge_user).to be nil
end
it 'Posts a system note' do
note = mr_merge_if_green_enabled.notes.last
expect(note.note).to include 'Canceled the automatic merge'
end
end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment