summaryrefslogtreecommitdiff
path: root/spec/models
diff options
context:
space:
mode:
authorRui Anderson <anderson.rui@gmail.com>2016-04-27 15:34:42 -0300
committerRémy Coutable <remy@rymai.me>2016-06-10 14:36:54 +0200
commit07dbd6b3884c4f188b2c3f29dd7419791f1051eb (patch)
tree6c00e4b9097f62a89fcd6f506a9c7b3eb27231bc /spec/models
parentcfc99bbd1390bc548a703fdc7857c7db5b0e7c13 (diff)
downloadgitlab-ce-07dbd6b3884c4f188b2c3f29dd7419791f1051eb.tar.gz
Allow or not merge MR with failed build
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'spec/models')
-rw-r--r--spec/models/merge_request_spec.rb117
1 files changed, 117 insertions, 0 deletions
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index 1b7cbc3efda..76912eed834 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -455,4 +455,121 @@ describe MergeRequest, models: true do
expect(user2.assigned_open_merge_request_count).to eq(1)
end
end
+
+ describe '#check_if_can_be_merged' do
+ let(:project) { create(:project, only_allow_merge_if_build_succeeds: true) }
+
+ subject { create(:merge_request, source_project: project, merge_status: :unchecked) }
+
+ context 'when it is not broken and has no conflicts' do
+ it 'is marked as mergeable' do
+ allow(subject).to receive(:broken?) { false }
+ allow(project).to receive_message_chain(:repository, :can_be_merged?) { true }
+
+ expect { subject.check_if_can_be_merged }.to change { subject.merge_status }.to('can_be_merged')
+ end
+ end
+
+ context 'when broken' do
+ before { allow(subject).to receive(:broken?) { true } }
+
+ it 'becomes unmergeable' do
+ expect { subject.check_if_can_be_merged }.to change { subject.merge_status }.to('cannot_be_merged')
+ end
+ end
+
+ context 'when it has conflicts' do
+ before do
+ allow(subject).to receive(:broken?) { false }
+ allow(project).to receive_message_chain(:repository, :can_be_merged?) { false }
+ end
+
+ it 'becomes unmergeable' do
+ expect { subject.check_if_can_be_merged }.to change { subject.merge_status }.to('cannot_be_merged')
+ end
+ end
+ end
+
+ describe '#mergeable?' do
+ let(:project) { create(:project, only_allow_merge_if_build_succeeds: true) }
+
+ subject { create(:merge_request, source_project: project) }
+
+ it "checks if merge request can be merged" do
+ allow(subject).to receive(:cannot_be_merged_because_build_failed?) { false }
+ expect(subject).to receive(:check_if_can_be_merged)
+
+ subject.mergeable?
+ end
+
+ context 'when not open' do
+ before { subject.close }
+
+ it 'returns false' do
+ expect(subject.mergeable?).to be_falsey
+ end
+ end
+
+ context 'when working in progress' do
+ before { subject.title = 'WIP MR' }
+
+ it 'returns false' do
+ expect(subject.mergeable?).to be_falsey
+ end
+ end
+
+ context 'when broken' do
+ before { allow(subject).to receive(:broken?) { true } }
+
+ it 'returns false' do
+ expect(subject.mergeable?).to be_falsey
+ end
+ end
+
+ context 'when failed' do
+ before { allow(subject).to receive(:broken?) { false } }
+
+ context "when project settings restrict to merge only if build succeeds" do
+ before { allow(subject).to receive(:cannot_be_merged_because_build_failed?) { true } }
+ it 'returns false if project settings restrict to merge only if build succeeds' do
+ expect(subject.mergeable?).to be_falsey
+ end
+ end
+ end
+ end
+
+ describe '#cannot_be_merged_because_build_failed?' do
+ let(:project) { create(:empty_project, only_allow_merge_if_build_succeeds: true) }
+ let(:commit_status) { create(:commit_status, status: 'failed', project: project) }
+ let(:ci_commit) { create(:ci_empty_pipeline) }
+
+ subject { build(:merge_request, target_project: project) }
+
+ before do
+ ci_commit.statuses << commit_status
+ allow(subject).to receive(:ci_commit) { ci_commit }
+ end
+
+ it "returns true if it's only allowed to merge green build and build has been failed" do
+ expect(subject.cannot_be_merged_because_build_failed?).to be_truthy
+ end
+
+ context 'when no ci_commit is associated' do
+ before do
+ allow(subject).to receive(:ci_commit) { nil }
+ end
+
+ it 'returns false' do
+ expect(subject.cannot_be_merged_because_build_failed?).to be_falsey
+ end
+ end
+
+ context "when isn't only allowed to merge green build at project settings" do
+ subject { build(:merge_request, target_project: build(:empty_project, only_allow_merge_if_build_succeeds: false)) }
+
+ it 'returns false' do
+ expect(subject.cannot_be_merged_because_build_failed?).to be_falsey
+ end
+ end
+ end
end