diff options
author | Zeger-Jan van de Weg <mail@zjvandeweg.nl> | 2015-11-24 14:59:02 +0100 |
---|---|---|
committer | Zeger-Jan van de Weg <mail@zjvandeweg.nl> | 2015-12-02 13:27:16 +0100 |
commit | a7682f8775a4609ac8c70151ffe8f3ccf3b767b6 (patch) | |
tree | 0a8cbe67be583b1e02daa1316b22b1b67ef018a8 /spec/models/merge_request_spec.rb | |
parent | 8608c6325e19f529f7b43ff881c562d3a0114e1c (diff) | |
download | gitlab-ce-a7682f8775a4609ac8c70151ffe8f3ccf3b767b6.tar.gz |
Specs for 'Merge When Build Succeeds'
Diffstat (limited to 'spec/models/merge_request_spec.rb')
-rw-r--r-- | spec/models/merge_request_spec.rb | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index 1bd09a1b0fb..c7a9765825e 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -174,6 +174,30 @@ describe MergeRequest do end end + describe '#can_remove_source_branch' do + let(:user) { build(:user)} + + before do + subject.source_project.team << [user, :master] + end + + it "cant be merged when its a a protected branch" do + subject.source_project.protected_branches = []; + + expect(subject.can_remove_source_branch?(user)).to be_falsey + end + + it "cant remove a root ref" do + subject.source_branch = "master"; + + expect(subject.can_remove_source_branch?(user)).to be_falsey + end + + it "is truthy in all other cases" do + expect(subject.can_remove_source_branch?(user)) + end + end + describe "#reset_merge_when_build_succeeds" do let(:merge_if_green) { create :merge_request, merge_when_build_succeeds: true } it "sets the item to false" do |