Commit 41e97a766b2cf5f75bfca5bb892e49eba720a330
1 parent
d27ed43d
Exists in
master
and in
4 other branches
Creating test values moved to before
Showing
1 changed file
with
11 additions
and
6 deletions
Show diff stats
spec/models/milestone_spec.rb
| @@ -110,26 +110,31 @@ describe Milestone do | @@ -110,26 +110,31 @@ describe Milestone do | ||
| 110 | end | 110 | end |
| 111 | 111 | ||
| 112 | describe :is_empty? do | 112 | describe :is_empty? do |
| 113 | - it 'Should return total count of issues and merge requests assigned to milestone' do | 113 | + before do |
| 114 | issue = create :closed_issue, milestone: milestone | 114 | issue = create :closed_issue, milestone: milestone |
| 115 | merge_request = create :merge_request, milestone: milestone | 115 | merge_request = create :merge_request, milestone: milestone |
| 116 | + end | ||
| 116 | 117 | ||
| 118 | + it 'Should return total count of issues and merge requests assigned to milestone' do | ||
| 117 | milestone.total_items_count.should eq 2 | 119 | milestone.total_items_count.should eq 2 |
| 118 | end | 120 | end |
| 119 | end | 121 | end |
| 120 | 122 | ||
| 121 | describe :can_be_closed? do | 123 | describe :can_be_closed? do |
| 122 | - it 'should be true if milestone active and all nestied issues closed' do | 124 | + before do |
| 123 | milestone = create :milestone | 125 | milestone = create :milestone |
| 124 | - closed_issue = create :closed_issue, milestone: milestone | 126 | + create :closed_issue, milestone: milestone |
| 127 | + | ||
| 128 | + issue = create :issue | ||
| 129 | + end | ||
| 125 | 130 | ||
| 131 | + it 'should be true if milestone active and all nestied issues closed' do | ||
| 126 | milestone.can_be_closed?.should be_true | 132 | milestone.can_be_closed?.should be_true |
| 127 | end | 133 | end |
| 128 | 134 | ||
| 129 | it 'should be false if milestone active and not all nestied issues closed' do | 135 | it 'should be false if milestone active and not all nestied issues closed' do |
| 130 | - milestone = create :milestone | ||
| 131 | - closed_issue = create :closed_issue, milestone: milestone | ||
| 132 | - issue = create :issue, milestone: milestone | 136 | + issue.milestone = milestone |
| 137 | + issue.save | ||
| 133 | 138 | ||
| 134 | milestone.can_be_closed?.should be_false | 139 | milestone.can_be_closed?.should be_false |
| 135 | end | 140 | end |