Commit cd2b0361 authored by Sean McGivern's avatar Sean McGivern

Merge branch 'fix/milestone-weight-is-missing' into 'master'

Fix milestone total weight is missing on the milestone page

Fixes #1340

See merge request !944
parents 22b0091e 117dedb3
......@@ -25,8 +25,15 @@
%span.milestone-stat
%strong== #{milestone.percent_complete(current_user)}%
complete
%span.milestone-stat
%span.remaining-days= milestone_remaining_days(milestone)
- remaining_days = milestone_remaining_days(milestone)
- if remaining_days.present?
%span.milestone-stat
%span.remaining-days= remaining_days
- total_weight = milestone.issues_visible_to_user(current_user).sum(:weight)
- unless total_weight.zero?
%span.milestone-stat
Total weight:
%strong= total_weight
.milestone-progress-buttons
%span.tab-issues-buttons
......
---
title: Add milestone total weight to the milestone summary
merge_request:
author:
require 'spec_helper'
describe 'Milestones', feature: true do
context 'milestone summary' do
let(:project) { create(:empty_project, :public) }
let(:milestone) { create(:milestone, project: project) }
it 'shows the total weight when sum is greater than zero' do
create(:issue, project: project, milestone: milestone, weight: 3)
create(:issue, project: project, milestone: milestone, weight: 1)
visit_milestone_page
within '.milestone-summary' do
expect(page).to have_content 'Total weight: 4'
end
end
it 'hides the total weight when sum is equal to zero' do
create(:issue, project: project, milestone: milestone, weight: nil)
create(:issue, project: project, milestone: milestone, weight: nil)
visit_milestone_page
within '.milestone-summary' do
expect(page).not_to have_content 'Total weight:'
end
end
def visit_milestone_page
visit namespace_project_milestone_path(project.namespace.to_param, project.to_param, milestone.to_param)
end
end
end
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