diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-07-10 07:44:16 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-07-10 07:44:16 +0000 |
commit | 4fb5a39dc04822f1cfac1090a431e51fb43e7a07 (patch) | |
tree | 5d13d1d97c9c70b8b0246a44227d5fd8bf18b8d1 | |
parent | 018602b4c84555e4a3dc49480ede0a98cf757476 (diff) | |
parent | 4a505f38acdefe1ee023dcdd773385bf7b7270bb (diff) | |
download | gitlab-ce-4fb5a39dc04822f1cfac1090a431e51fb43e7a07.tar.gz |
Merge branch 'group_milestones_description' into 'master'
Group milestones description
Fixes #1403
See merge request !958
-rw-r--r-- | app/views/groups/milestones/show.html.haml | 12 | ||||
-rw-r--r-- | features/group.feature | 4 | ||||
-rw-r--r-- | features/steps/group/group.rb | 10 |
3 files changed, 24 insertions, 2 deletions
diff --git a/app/views/groups/milestones/show.html.haml b/app/views/groups/milestones/show.html.haml index 4b6c00a3247..29b274af5a5 100644 --- a/app/views/groups/milestones/show.html.haml +++ b/app/views/groups/milestones/show.html.haml @@ -26,6 +26,18 @@ %h4.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 %p Progress: diff --git a/features/group.feature b/features/group.feature index 0c70e5b915c..b5ff03db844 100644 --- a/features/group.feature +++ b/features/group.feature @@ -121,6 +121,7 @@ Feature: Groups Then I should see user "Mary Jane" 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 When I visit group "Owned" page @@ -138,4 +139,5 @@ Feature: Groups When I visit group "Owned" page And I click on group milestones 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 diff --git a/features/steps/group/group.rb b/features/steps/group/group.rb index 85276f04dd2..28c370e828f 100644 --- a/features/steps/group/group.rb +++ b/features/steps/group/group.rb @@ -187,6 +187,12 @@ class Groups < Spinach::FeatureSteps click_link 'GL-113' 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 page.should have_content('Milestone GL-113') page.should have_content('Progress: 0 closed – 4 open') @@ -232,7 +238,9 @@ class Groups < Spinach::FeatureSteps project: project2 milestone2_project3 = create :milestone, 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, project: @project1, assignee: current_user, |