summaryrefslogtreecommitdiff
path: root/spec/models/merge_request_spec.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-06-23 00:08:58 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-06-23 00:08:58 +0000
commit94221585cabf666f38ac989978838393fc3bf56e (patch)
tree54cae93eba04c045b3b2037bbcdbaf913320c9c6 /spec/models/merge_request_spec.rb
parent2319d04d069d5e066e35cc44035239b21d3fae32 (diff)
downloadgitlab-ce-94221585cabf666f38ac989978838393fc3bf56e.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/models/merge_request_spec.rb')
-rw-r--r--spec/models/merge_request_spec.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index c70ddac5da6..031b0688c7b 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -1170,6 +1170,12 @@ describe MergeRequest do
expect(subject.can_remove_source_branch?(user)).to be_falsey
end
+ it "can't be removed because source project has been deleted" do
+ subject.source_project = nil
+
+ expect(subject.can_remove_source_branch?(user)).to be_falsey
+ end
+
it "can't remove a root ref" do
subject.update(source_branch: 'master', target_branch: 'feature')