summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-05-28 12:40:22 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-05-28 12:40:22 +0300
commit8a3807c83880f71612b1e092c49e865d24e29704 (patch)
treed32c277c4260f48009d5aa8b162b2804d59ef118
parent49c50ee868cc355ae8d748ec67fce2e01311697f (diff)
downloadgitlab-ce-8a3807c83880f71612b1e092c49e865d24e29704.tar.gz
Fix tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--spec/models/merge_request_spec.rb19
1 files changed, 0 insertions, 19 deletions
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index a10673fda9c..81a48699cd8 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -82,25 +82,6 @@ describe MergeRequest do
end
end
- describe '#allow_source_branch_removal?' do
- it 'should not allow removal when mr is a fork' do
-
- subject.disallow_source_branch_removal?.should be_true
- end
- it 'should not allow removal when the mr is not a fork, but the source branch is the root reference' do
- subject.target_project = subject.source_project
- subject.source_branch = subject.source_project.repository.root_ref
- subject.disallow_source_branch_removal?.should be_true
- end
-
- it 'should not disallow removal when the mr is not a fork, and but source branch is not the root reference' do
- subject.target_project = subject.source_project
- subject.source_branch = "Something Different #{subject.source_project.repository.root_ref}"
- subject.for_fork?.should be_false
- subject.disallow_source_branch_removal?.should be_false
- end
- end
-
describe 'detection of issues to be closed' do
let(:issue0) { create :issue, project: subject.project }
let(:issue1) { create :issue, project: subject.project }