summaryrefslogtreecommitdiff
path: root/features/project
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2015-09-17 08:04:37 +0000
committerStan Hu <stanhu@gmail.com>2015-09-17 08:04:37 +0000
commitf4816372457c3b513f8707efd87ce34c9922177c (patch)
tree534be1d81e56da85514b88dd47fde25a7cf093f1 /features/project
parent2e9a7032cec02588484eb162717298d311770c7d (diff)
parentd3d03d1362e576d194782a655cdfe9bc6ed5c596 (diff)
downloadgitlab-ce-f4816372457c3b513f8707efd87ce34c9922177c.tar.gz
Merge branch 'fix-issue-2382' into 'master'
Create a "destroyed Milestone" event and keep Milestone events around in the DB for posterity Also fix issue where destroying a Milestone would cause odd, transient messages like "created milestone" or "imported milestone". Now if a milestone is destroyed, at least it will indicate in the activity feed even if it's not clear which milestone was destroyed: ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c89cc8a0a9fa549deac433f17b890913/image.png) Closes #2382 See merge request !1227
Diffstat (limited to 'features/project')
-rw-r--r--features/project/issues/milestones.feature8
1 files changed, 6 insertions, 2 deletions
diff --git a/features/project/issues/milestones.feature b/features/project/issues/milestones.feature
index bfbaaec5a35..c1a20e9b488 100644
--- a/features/project/issues/milestones.feature
+++ b/features/project/issues/milestones.feature
@@ -12,13 +12,17 @@ Feature: Project Issues Milestones
Given I click link "v2.2"
Then I should see milestone "v2.2"
- Scenario: I create new milestone
+ @javascript
+ Scenario: I create and delete new milestone
Given I click link "New Milestone"
And I submit new milestone "v2.3"
Then I should see milestone "v2.3"
+ Given I click link to remove milestone
+ When I visit project "Shop" activity page
+ Then I should see deleted milestone activity
Scenario: I delete new milestone
- Given I click link to remove milestone "v2.2"
+ Given I click link to remove milestone
And I should see no milestones
@javascript