summaryrefslogtreecommitdiff
path: root/spec/finders
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2019-03-11 14:15:05 +0000
committerSean McGivern <sean@gitlab.com>2019-03-19 14:28:30 +0000
commit222199f67032306aa318cab3f09f4be1d5c7e731 (patch)
tree3917231bda5da39507db995eb6ff5075db641f9f /spec/finders
parent8d067414f5112be1a8e927ba06fad0abc989038f (diff)
downloadgitlab-ce-222199f67032306aa318cab3f09f4be1d5c7e731.tar.gz
Only count active milestones as started
The Upcoming milestone filter only considers active milestones, but the Started one included closed milestones, too. This was inconsistent.
Diffstat (limited to 'spec/finders')
-rw-r--r--spec/finders/issues_finder_spec.rb3
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)