summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorMarin Jankovski <marin@gitlab.com>2014-07-10 08:46:52 +0200
committerMarin Jankovski <marin@gitlab.com>2014-07-10 08:46:52 +0200
commit4a505f38acdefe1ee023dcdd773385bf7b7270bb (patch)
tree2700ba995c75c59434ab83f9fd63303df9d6c256 /features
parent0f80ffdf8756a76a6ea0daaa2da5d3e193fcbe99 (diff)
downloadgitlab-ce-4a505f38acdefe1ee023dcdd773385bf7b7270bb.tar.gz
Update the tests with milestones descriptions.
Diffstat (limited to 'features')
-rw-r--r--features/group.feature4
-rw-r--r--features/steps/group/group.rb10
2 files changed, 12 insertions, 2 deletions
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,