Commit 8499de19 authored by Alfredo Sumaran's avatar Alfredo Sumaran

Ensure milestone counts work with no data

Commit originally written by @smcgivern
parent 19e2bf1c
...@@ -40,10 +40,11 @@ module MilestonesHelper ...@@ -40,10 +40,11 @@ module MilestonesHelper
# and we need to add the total # and we need to add the total
def milestone_counts(milestones) def milestone_counts(milestones)
counts = milestones.reorder(nil).group(:state).count counts = milestones.reorder(nil).group(:state).count
{ {
opened: counts['active'], opened: counts['active'] || 0,
closed: counts['closed'], closed: counts['closed'] || 0,
all: counts.values.sum all: counts.values.sum || 0
} }
end end
......
...@@ -3,33 +3,31 @@ require 'spec_helper' ...@@ -3,33 +3,31 @@ require 'spec_helper'
describe MilestonesHelper do describe MilestonesHelper do
describe '#milestone_counts' do describe '#milestone_counts' do
let(:project) { FactoryGirl.create(:project) } let(:project) { FactoryGirl.create(:project) }
let(:counts) { helper.milestone_counts(project.milestones) }
context 'when there are milestones' do
let!(:milestone_1) { FactoryGirl.create(:active_milestone, project: project) } let!(:milestone_1) { FactoryGirl.create(:active_milestone, project: project) }
let!(:milestone_2) { FactoryGirl.create(:active_milestone, project: project) } let!(:milestone_2) { FactoryGirl.create(:active_milestone, project: project) }
let!(:milestone_3) { FactoryGirl.create(:closed_milestone, project: project) } let!(:milestone_3) { FactoryGirl.create(:closed_milestone, project: project) }
let(:counts) { helper.milestone_counts(project.milestones) } it 'returns the correct counts' do
expect(counts).to eq(opened: 2, closed: 1, all: 3)
it 'returns a hash containing three items' do
expect(counts.length).to eq 3
end end
it 'returns a hash containing "opened" key' do
expect(counts.has_key?(:opened)).to eq true
end end
it 'returns a hash containing "closed" key' do context 'when there are only milestones of one type' do
expect(counts.has_key?(:closed)).to eq true let!(:milestone_1) { FactoryGirl.create(:active_milestone, project: project) }
end let!(:milestone_2) { FactoryGirl.create(:active_milestone, project: project) }
it 'returns a hash containing "all" key' do it 'returns the correct counts' do
expect(counts.has_key?(:all)).to eq true expect(counts).to eq(opened: 2, closed: 0, all: 2)
end
end end
it 'shows "all" object is the sum of "opened" and "closed" objects' do context 'when there are no milestones' do
puts counts.as_json it 'returns the correct counts' do
total = counts[:opened] + counts[:closed] expect(counts).to eq(opened: 0, closed: 0, all: 0)
expect(counts[:all]).to eq total end
end end
end end
end end
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment