diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2019-03-19 22:25:11 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2019-03-19 22:25:11 +0000 |
| commit | 53b92141b53b5a1dde33bc466457a2af29422ea6 (patch) | |
| tree | d9813098ad6c5e15e5ac582c53b41690283eed45 /spec/finders | |
| parent | 8441b23e35c84e64f6440493f8a539b42c42ebec (diff) | |
| parent | 222199f67032306aa318cab3f09f4be1d5c7e731 (diff) | |
| download | gitlab-ce-53b92141b53b5a1dde33bc466457a2af29422ea6.tar.gz | |
Merge branch 'only-counted-active-milestones-as-started' into 'master'
Only count active milestones as started
Closes #58782
See merge request gitlab-org/gitlab-ce!25969
Diffstat (limited to 'spec/finders')
| -rw-r--r-- | spec/finders/issues_finder_spec.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/spec/finders/issues_finder_spec.rb b/spec/finders/issues_finder_spec.rb index 55efab7dec3..f74eb1364a6 100644 --- a/spec/finders/issues_finder_spec.rb +++ b/spec/finders/issues_finder_spec.rb @@ -220,6 +220,7 @@ describe IssuesFinder do let(:yesterday) { Date.today - 1.day } let(:tomorrow) { Date.today + 1.day } let(:two_days_ago) { Date.today - 2.days } + let(:three_days_ago) { Date.today - 3.days } let(:milestones) do [ @@ -227,6 +228,8 @@ describe IssuesFinder do create(:milestone, project: project_started_1_and_2, title: '1.0', start_date: two_days_ago), create(:milestone, project: project_started_1_and_2, title: '2.0', start_date: yesterday), create(:milestone, project: project_started_1_and_2, title: '3.0', start_date: tomorrow), + create(:milestone, :closed, project: project_started_1_and_2, title: '4.0', start_date: three_days_ago), + create(:milestone, :closed, project: project_started_8, title: '6.0', start_date: three_days_ago), create(:milestone, project: project_started_8, title: '7.0'), create(:milestone, project: project_started_8, title: '8.0', start_date: yesterday), create(:milestone, project: project_started_8, title: '9.0', start_date: tomorrow) |