Merge branch 'master' into sidebar-sizing-higher-viewportsidebar-sizing-higher-viewport

7 files changed, 118 insertions, 0 deletions

diff --git a/features/project/builds/summary.feature b/features/project/builds/summary.feature
index b69d279517b..4f3fd194d00 100644
--- a/features/project/builds/summary.feature
+++ b/features/project/builds/summary.feature
@@ -13,3 +13,12 @@ Feature: Project Builds Summary
   Scenario: I browse project builds page
     When I visit project builds page
     Then I see button to CI Lint
+
+  Scenario: I erase a build
+    Given recent build is successful
+    And recent build has a build trace
+    When I visit recent build details page
+    And I click erase build button
+    Then recent build has been erased
+    And recent build summary does not have artifacts widget
+    And recent build summary contains information saying that build has been erased
diff --git a/features/project/commits/revert.feature b/features/project/commits/revert.feature
new file mode 100644
index 00000000000..7a2effafe03
--- /dev/null
+++ b/features/project/commits/revert.feature
@@ -0,0 +1,28 @@
+@project_commits
+Feature: Revert Commits
+  Background:
+    Given I sign in as a user
+    And I own a project
+    And I visit my project's commits page
+
+  Scenario: I revert a commit
+    Given I click on commit link
+    And I click on the revert button
+    And I revert the changes directly
+    Then I should see the revert commit notice
+
+  Scenario: I revert a commit that was previously reverted
+    Given I click on commit link
+    And I click on the revert button
+    And I revert the changes directly
+    And I visit my project's commits page
+    And I click on commit link
+    And I click on the revert button
+    And I revert the changes directly
+    Then I should see a revert error
+
+  Scenario: I revert a commit in a new merge request
+    Given I click on commit link
+    And I click on the revert button
+    And I revert the changes in a new merge request
+    Then I should see the new merge request notice
diff --git a/features/project/fork.feature b/features/project/fork.feature
index 12695204e47..ca3f2771aa5 100644
--- a/features/project/fork.feature
+++ b/features/project/fork.feature
@@ -32,6 +32,13 @@ Feature: Project Fork
     And I visit the forks page of the "Shop" project
     Then I should see my fork on the list
 
+  Scenario: Viewing forks of a Project that has no repo
+    Given I click link "Fork"
+    When I fork to my namespace
+    And I make forked repo invalid
+    And I visit the forks page of the "Shop" project
+    Then I should see my fork on the list
+
   Scenario: Viewing private forks of a Project
     Given There is an existent fork of the "Shop" project
     And I click link "Fork"
diff --git a/features/project/issues/issues.feature b/features/project/issues/issues.feature
index ca2399d85a9..89af58dcef3 100644
--- a/features/project/issues/issues.feature
+++ b/features/project/issues/issues.feature
@@ -89,6 +89,16 @@ Feature: Project Issues
     Then The list should be sorted by "Oldest updated"
 
   @javascript
+  Scenario: Sort issues by upvotes/downvotes
+    Given project "Shop" have "Bugfix" open issue
+    And issue "Release 0.4" have 2 upvotes and 1 downvote
+    And issue "Tweet control" have 1 upvote and 2 downvotes
+    And I sort the list by "Most popular"
+    Then The list should be sorted by "Most popular"
+    And I sort the list by "Least popular"
+    Then The list should be sorted by "Least popular"
+
+  @javascript
   Scenario: I search issue
     Given I fill in issue search with "Re"
     Then I should see "Release 0.4" in issues
diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature
index 5995e787961..495f25f28e7 100644
--- a/features/project/merge_requests.feature
+++ b/features/project/merge_requests.feature
@@ -108,6 +108,17 @@ Feature: Project Merge Requests
     Then The list should be sorted by "Oldest updated"
 
   @javascript
+  Scenario: Sort merge requests by upvotes/downvotes
+    Given project "Shop" have "Bug NS-05" open merge request with diffs inside
+    And project "Shop" have "Bug NS-06" open merge request
+    And merge request "Bug NS-04" have 2 upvotes and 1 downvote
+    And merge request "Bug NS-06" have 1 upvote and 2 downvotes
+    And I sort the list by "Most popular"
+    Then The list should be sorted by "Most popular"
+    And I sort the list by "Least popular"
+    Then The list should be sorted by "Least popular"
+
+  @javascript
   Scenario: Visiting Merge Requests after commenting on diffs
     Given project "Shop" have "Bug NS-05" open merge request with diffs inside
     And I visit merge request page "Bug NS-05"
diff --git a/features/project/merge_requests/revert.feature b/features/project/merge_requests/revert.feature
new file mode 100644
index 00000000000..d767b088883
--- /dev/null
+++ b/features/project/merge_requests/revert.feature
@@ -0,0 +1,30 @@
+@project_merge_requests
+Feature: Revert Merge Requests
+  Background:
+    Given There is an open Merge Request
+      And I am signed in as a developer of the project
+      And I am on the Merge Request detail page
+      And I click on Accept Merge Request
+
+  @javascript
+  Scenario: I revert a merge request
+    Given I click on the revert button
+    And I revert the changes directly
+    Then I should see the revert merge request notice
+
+  @javascript
+  Scenario: I revert a merge request that was previously reverted
+    Given I click on the revert button
+    And I revert the changes directly
+    And I am on the Merge Request detail page
+    And I click on the revert button
+    And I revert the changes directly
+    Then I should see a revert error
+
+  @javascript
+  Scenario: I revert a merge request in a new merge request
+    Given I click on the revert button
+    And I am on the Merge Request detail page
+    And I click on the revert button
+    And I revert the changes in a new merge request
+    Then I should see the new merge request notice
diff --git a/features/project/milestone.feature b/features/project/milestone.feature
new file mode 100644
index 00000000000..e0f4c0e9d7c
--- /dev/null
+++ b/features/project/milestone.feature
@@ -0,0 +1,23 @@
+Feature: Project Milestone
+  Background:
+    Given I sign in as a user
+    And I own project "Shop"
+    And project "Shop" has labels: "bug", "feature", "enhancement"
+    And project "Shop" has milestone "v2.2"
+    And milestone has issue "Bugfix1" with labels: "bug", "feature"
+    And milestone has issue "Bugfix2" with labels: "bug", "enhancement"
+
+
+  @javascript
+  Scenario: Listing issues from issues tab
+    Given I visit project "Shop" milestones page
+    And I click link "v2.2"
+    Then I should see the labels "bug", "enhancement" and "feature"
+
+  @javascript
+  Scenario: Listing labels from labels tab
+    Given I visit project "Shop" milestones page
+    And I click link "v2.2"
+    And I click link "Labels"
+    Then I should see the list of labels
+    And I should see the labels "bug", "enhancement" and "feature"