Commit 4fb5a39d authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'group_milestones_description' into 'master'

Group milestones description

Fixes #1403

See merge request !958
parents 018602b4 4a505f38
...@@ -26,6 +26,18 @@ ...@@ -26,6 +26,18 @@
%h4.title %h4.title
= gfm escape_once(@group_milestone.title) = gfm escape_once(@group_milestone.title)
.description
- @group_milestone.milestones.each do |milestone|
%hr
%h4
= link_to "#{milestone.project.name} - #{milestone.title}", project_milestone_path(milestone.project, milestone)
%span.pull-right= milestone.expires_at
= preserve do
- if milestone.description.present?
= milestone.description
- else
%em Project milestone has no description
.context .context
%p %p
Progress: Progress:
......
...@@ -121,6 +121,7 @@ Feature: Groups ...@@ -121,6 +121,7 @@ Feature: Groups
Then I should see user "Mary Jane" in team list Then I should see user "Mary Jane" in team list
Then I should not see user "John Doe" in team list Then I should not see user "John Doe" in team list
# Group milestones
Scenario: I should see group "Owned" milestone index page with no milestones Scenario: I should see group "Owned" milestone index page with no milestones
When I visit group "Owned" page When I visit group "Owned" page
...@@ -138,4 +139,5 @@ Feature: Groups ...@@ -138,4 +139,5 @@ Feature: Groups
When I visit group "Owned" page When I visit group "Owned" page
And I click on group milestones And I click on group milestones
And I click on one group milestone And I click on one group milestone
Then I should see group milestone with all issues and MRs assigned to that milestone Then I should see group milestone with descriptions and expiry date
And I should see group milestone with all issues and MRs assigned to that milestone
...@@ -187,6 +187,12 @@ class Groups < Spinach::FeatureSteps ...@@ -187,6 +187,12 @@ class Groups < Spinach::FeatureSteps
click_link 'GL-113' click_link 'GL-113'
end end
step 'I should see group milestone with descriptions and expiry date' do
page.should have_content('Lorem Ipsum is simply dummy text of the printing and typesetting industry')
page.should have_content('expires at Aug 20, 2014')
page.should have_content('Project milestone has no description')
end
step 'I should see group milestone with all issues and MRs assigned to that milestone' do step 'I should see group milestone with all issues and MRs assigned to that milestone' do
page.should have_content('Milestone GL-113') page.should have_content('Milestone GL-113')
page.should have_content('Progress: 0 closed – 4 open') page.should have_content('Progress: 0 closed – 4 open')
...@@ -232,7 +238,9 @@ class Groups < Spinach::FeatureSteps ...@@ -232,7 +238,9 @@ class Groups < Spinach::FeatureSteps
project: project2 project: project2
milestone2_project3 = create :milestone, milestone2_project3 = create :milestone,
title: "GL-113", title: "GL-113",
project: @project3 project: @project3,
due_date: '2014-08-20',
description: 'Lorem Ipsum is simply dummy text of the printing and typesetting industry'
@issue1 = create :issue, @issue1 = create :issue,
project: @project1, project: @project1,
assignee: current_user, assignee: current_user,
......
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