Commit 8a3807c83880f71612b1e092c49e865d24e29704
1 parent
49c50ee8
Exists in
spb-stable
and in
2 other branches
Fix tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing
1 changed file
with
0 additions
and
19 deletions
Show diff stats
spec/models/merge_request_spec.rb
| @@ -82,25 +82,6 @@ describe MergeRequest do | @@ -82,25 +82,6 @@ describe MergeRequest do | ||
| 82 | end | 82 | end |
| 83 | end | 83 | end |
| 84 | 84 | ||
| 85 | - describe '#allow_source_branch_removal?' do | ||
| 86 | - it 'should not allow removal when mr is a fork' do | ||
| 87 | - | ||
| 88 | - subject.disallow_source_branch_removal?.should be_true | ||
| 89 | - end | ||
| 90 | - it 'should not allow removal when the mr is not a fork, but the source branch is the root reference' do | ||
| 91 | - subject.target_project = subject.source_project | ||
| 92 | - subject.source_branch = subject.source_project.repository.root_ref | ||
| 93 | - subject.disallow_source_branch_removal?.should be_true | ||
| 94 | - end | ||
| 95 | - | ||
| 96 | - it 'should not disallow removal when the mr is not a fork, and but source branch is not the root reference' do | ||
| 97 | - subject.target_project = subject.source_project | ||
| 98 | - subject.source_branch = "Something Different #{subject.source_project.repository.root_ref}" | ||
| 99 | - subject.for_fork?.should be_false | ||
| 100 | - subject.disallow_source_branch_removal?.should be_false | ||
| 101 | - end | ||
| 102 | - end | ||
| 103 | - | ||
| 104 | describe 'detection of issues to be closed' do | 85 | describe 'detection of issues to be closed' do |
| 105 | let(:issue0) { create :issue, project: subject.project } | 86 | let(:issue0) { create :issue, project: subject.project } |
| 106 | let(:issue1) { create :issue, project: subject.project } | 87 | let(:issue1) { create :issue, project: subject.project } |