Merge branch 'master' into markdown_preview_shortcut

16 files changed, 139 insertions, 53 deletions

diff --git a/features/dashboard/archived_projects.feature b/features/dashboard/archived_projects.feature
index 69b3a776441..bed9282f1c6 100644
--- a/features/dashboard/archived_projects.feature
+++ b/features/dashboard/archived_projects.feature
@@ -10,3 +10,8 @@ Feature: Dashboard Archived Projects
   Scenario: I should see non-archived projects on dashboard
     Then I should see "Shop" project link
     And I should not see "Forum" project link
+
+  Scenario: I toggle show of archived projects on dashboard
+    When I click "Show archived projects" link
+    Then I should see "Shop" project link
+    And I should see "Forum" project link
diff --git a/features/explore/projects.feature b/features/explore/projects.feature
index 7df6b6f09ba..092e18d1b86 100644
--- a/features/explore/projects.feature
+++ b/features/explore/projects.feature
@@ -140,4 +140,4 @@ Feature: Explore Projects
     When I visit the explore starred projects
     Then I should see project "Community"
     And I should see project "Internal"
-    And I should see project "Archive"
+    And I should not see project "Archive"
diff --git a/features/group/milestones.feature b/features/group/milestones.feature
index 62ea66a783c..d6c05df9840 100644
--- a/features/group/milestones.feature
+++ b/features/group/milestones.feature
@@ -28,3 +28,20 @@ Feature: Group Milestones
     And I fill milestone name
     When I press create mileston button
     Then milestone in each project should be created
+
+  Scenario: I should see Issues listed with labels
+    Given Group has projects with milestones
+    When I visit group "Owned" page
+    And I click on group milestones
+    And I click on one group milestone
+    Then I should see the "bug" label
+    And I should see the "feature" label
+    And I should see the project name in the Issue row
+
+  Scenario: I should see the Labels tab
+    Given Group has projects with milestones
+    When I visit group "Owned" page
+    And I click on group milestones
+    And I click on one group milestone
+    And I click on the "Labels" tab
+    Then I should see the list of labels
diff --git a/features/project/issues/issues.feature b/features/project/issues/issues.feature
index 89af58dcef3..ff21c7d1b83 100644
--- a/features/project/issues/issues.feature
+++ b/features/project/issues/issues.feature
@@ -59,14 +59,6 @@ Feature: Project Issues
     And I should see an error alert section within the comment form
 
   @javascript
-  Scenario: Visiting Issues after leaving a comment
-    Given I visit issue page "Release 0.4"
-    And I leave a comment like "XML attached"
-    And I visit project "Shop" issues page
-    And I sort the list by "Last updated"
-    Then I should see "Release 0.4" at the top
-
-  @javascript
   Scenario: Visiting Issues after being sorted the list
     Given I visit project "Shop" issues page
     And I sort the list by "Oldest updated"
diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature
index 495f25f28e7..f8d9fe1854d 100644
--- a/features/project/merge_requests.feature
+++ b/features/project/merge_requests.feature
@@ -26,6 +26,16 @@ Feature: Project Merge Requests
     When I visit project "Shop" merge requests page
     Then I should see "other_branch" branch
 
+  Scenario: I should not see the numbers of diverged commits if the branch is rebased on the target
+    Given project "Shop" have "Bug NS-07" open merge request with rebased branch
+    When I visit merge request page "Bug NS-07"
+    Then I should not see the diverged commits count
+
+  Scenario: I should see the numbers of diverged commits if the branch diverged from the target
+    Given project "Shop" have "Bug NS-08" open merge request with diverged branch
+    When I visit merge request page "Bug NS-08"
+    Then I should see the diverged commits count
+
   Scenario: I should see rejected merge requests
     Given I click link "Closed"
     Then I should see "Feature NS-03" in merge requests
@@ -77,15 +87,6 @@ Feature: Project Merge Requests
     Then I should see comment "XML attached"
 
   @javascript
-  Scenario: Visiting Merge Requests after leaving a comment
-    Given project "Shop" have "Bug NS-05" open merge request with diffs inside
-    And I visit merge request page "Bug NS-04"
-    And I leave a comment like "XML attached"
-    And I visit project "Shop" merge requests page
-    And I sort the list by "Last updated"
-    Then I should see "Bug NS-04" at the top
-
-  @javascript
   Scenario: Visiting Merge Requests after being sorted the list
     Given I visit project "Shop" merge requests page
     And I sort the list by "Oldest updated"
@@ -119,16 +120,6 @@ Feature: Project Merge Requests
     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"
-    And I click on the Changes tab
-    And I leave a comment like "Line is wrong" on diff
-    And I visit project "Shop" merge requests page
-    And I sort the list by "Last updated"
-    Then I should see "Bug NS-05" at the top
-
-  @javascript
   Scenario: I comment on a merge request diff
     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/steps/dashboard/archived_projects.rb b/features/steps/dashboard/archived_projects.rb
index 36e092f50c6..6510f8d9b32 100644
--- a/features/steps/dashboard/archived_projects.rb
+++ b/features/steps/dashboard/archived_projects.rb
@@ -19,4 +19,8 @@ class Spinach::Features::DashboardArchivedProjects < Spinach::FeatureSteps
   step 'I should see "Forum" project link' do
     expect(page).to have_link "Forum"
   end
+
+  step 'I click "Show archived projects" link' do
+    click_link "Show archived projects"
+  end
 end
diff --git a/features/steps/group/milestones.rb b/features/steps/group/milestones.rb
index 2363ad797fa..a167d259837 100644
--- a/features/steps/group/milestones.rb
+++ b/features/steps/group/milestones.rb
@@ -24,6 +24,9 @@ class Spinach::Features::GroupMilestones < Spinach::FeatureSteps
   end
 
   step 'I click on one group milestone' do
+    milestones = Milestone.where(title: 'GL-113')
+    @global_milestone = GlobalMilestone.new('GL-113', milestones)
+
     click_link 'GL-113'
   end
 
@@ -33,7 +36,7 @@ class Spinach::Features::GroupMilestones < Spinach::FeatureSteps
 
   step 'I should see group milestone with all issues and MRs assigned to that milestone' do
     expect(page).to have_content('Milestone GL-113')
-    expect(page).to have_content('Progress: 0 closed – 3 open')
+    expect(page).to have_content('3 issues: 3 open and 0 closed')
     issue = Milestone.find_by(name: 'GL-113').issues.first
     expect(page).to have_link(issue.title, href: namespace_project_issue_path(issue.project.namespace, issue.project, issue))
   end
@@ -60,6 +63,39 @@ class Spinach::Features::GroupMilestones < Spinach::FeatureSteps
     end
   end
 
+  step 'I should see the "bug" label' do
+    page.within('#tab-issues') do
+      expect(page).to have_content 'bug'
+    end
+  end
+
+  step 'I should see the "feature" label' do
+    page.within('#tab-issues') do
+      expect(page).to have_content 'bug'
+    end
+  end
+
+  step 'I should see the project name in the Issue row' do
+    page.within('#tab-issues') do
+      @global_milestone.projects.each do |project|
+        expect(page).to have_content project.name
+      end
+    end
+  end
+
+  step 'I click on the "Labels" tab' do
+    page.within('.nav-links') do
+      page.find(:xpath, "//a[@href='#tab-labels']").click
+    end
+  end
+
+  step 'I should see the list of labels' do
+    page.within('#tab-labels') do
+      expect(page).to have_content 'bug'
+      expect(page).to have_content 'feature'
+    end
+  end
+
   private
 
   def group_milestone
@@ -68,6 +104,10 @@ class Spinach::Features::GroupMilestones < Spinach::FeatureSteps
     %w(gitlabhq gitlab-ci cookbook-gitlab).each do |path|
       project = create :project, path: path, group: group
       milestone = create :milestone, title: "Version 7.2", project: project
+
+      create(:label, project: project, title: 'bug')
+      create(:label, project: project, title: 'feature')
+
       create :issue,
         project: project,
         assignee: current_user,
@@ -80,11 +120,14 @@ class Spinach::Features::GroupMilestones < Spinach::FeatureSteps
         due_date: '2114-08-20',
         description: 'Lorem Ipsum is simply dummy text'
 
-      create :issue,
+      issue = create :issue,
         project: project,
         assignee: current_user,
         author: current_user,
         milestone: milestone
+
+      issue.labels << project.labels.find_by(title: 'bug')
+      issue.labels << project.labels.find_by(title: 'feature')
     end
   end
 end
diff --git a/features/steps/project/issues/issues.rb b/features/steps/project/issues/issues.rb
index 565bf088b41..d9842ccf95e 100644
--- a/features/steps/project/issues/issues.rb
+++ b/features/steps/project/issues/issues.rb
@@ -355,10 +355,6 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
     end
   end
 
-  step 'I should see "Release 0.4" at the top' do
-    expect(page.find('ul.content-list.issues-list li.issue:first-child')).to have_content("Release 0.4")
-  end
-
   def filter_issue(text)
     fill_in 'issue_search', with: text
   end
diff --git a/features/steps/project/issues/milestones.rb b/features/steps/project/issues/milestones.rb
index e2eda511497..4faa0f4707c 100644
--- a/features/steps/project/issues/milestones.rb
+++ b/features/steps/project/issues/milestones.rb
@@ -59,7 +59,7 @@ class Spinach::Features::ProjectIssuesMilestones < Spinach::FeatureSteps
   end
 
   step 'I should see 3 issues' do
-    expect(page).to have_selector('#tab-issues li.issue-row', count: 4)
+    expect(page).to have_selector('#tab-issues li.issuable-row', count: 4)
   end
 
   step 'I click link to remove milestone' do
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb
index dde864f5180..c19b15bc9ed 100644
--- a/features/steps/project/merge_requests.rb
+++ b/features/steps/project/merge_requests.rb
@@ -60,7 +60,6 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
     expect(page).not_to have_content "Feature NS-03"
   end
 
-
   step 'I should not see "Bug NS-04" in merge requests' do
     expect(page).not_to have_content "Bug NS-04"
   end
@@ -121,6 +120,22 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
            author: project.users.first)
   end
 
+  step 'project "Shop" have "Bug NS-07" open merge request with rebased branch' do
+    create(:merge_request, :rebased,
+      title: "Bug NS-07",
+      source_project: project,
+      target_project: project,
+      author: project.users.first)
+  end
+
+  step 'project "Shop" have "Bug NS-08" open merge request with diverged branch' do
+    create(:merge_request, :diverged,
+      title: "Bug NS-08",
+      source_project: project,
+      target_project: project,
+      author: project.users.first)
+  end
+
   step 'project "Shop" have "Feature NS-03" closed merge request' do
     create(:closed_merge_request,
            title: "Feature NS-03",
@@ -490,12 +505,16 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
     end
   end
 
-  step 'I should see "Bug NS-05" at the top' do
-    expect(page.find('ul.content-list.mr-list li.merge-request:first-child')).to have_content("Bug NS-05")
+  step 'I should see the diverged commits count' do
+    page.within ".mr-source-target" do
+      expect(page).to have_content /([0-9]+ commits behind)/
+    end
   end
 
-  step 'I should see "Bug NS-04" at the top' do
-    expect(page.find('ul.content-list.mr-list li.merge-request:first-child')).to have_content("Bug NS-04")
+  step 'I should not see the diverged commits count' do
+    page.within ".mr-source-target" do
+      expect(page).not_to have_content /([0-9]+ commit[s]? behind)/
+    end
   end
 
   def merge_request
diff --git a/features/steps/project/merge_requests/acceptance.rb b/features/steps/project/merge_requests/acceptance.rb
index 2685f5fd6b4..4fda0731e2f 100644
--- a/features/steps/project/merge_requests/acceptance.rb
+++ b/features/steps/project/merge_requests/acceptance.rb
@@ -29,7 +29,7 @@ class Spinach::Features::ProjectMergeRequestsAcceptance < Spinach::FeatureSteps
   step 'There is an open Merge Request' do
     @user = create(:user)
     @project = create(:project, :public)
-    @project_member = create(:project_member, user: @user, project: @project, access_level: ProjectMember::DEVELOPER)
+    @project_member = create(:project_member, :developer, user: @user, project: @project)
     @merge_request = create(:merge_request, :with_diffs, :simple, source_project: @project)
   end
 
diff --git a/features/steps/project/merge_requests/revert.rb b/features/steps/project/merge_requests/revert.rb
index c5a4cfce6f0..efbc4831ce1 100644
--- a/features/steps/project/merge_requests/revert.rb
+++ b/features/steps/project/merge_requests/revert.rb
@@ -36,7 +36,7 @@ class Spinach::Features::RevertMergeRequests < Spinach::FeatureSteps
   step 'There is an open Merge Request' do
     @user = create(:user)
     @project = create(:project, :public)
-    @project_member = create(:project_member, user: @user, project: @project, access_level: ProjectMember::DEVELOPER)
+    @project_member = create(:project_member, :developer, user: @user, project: @project)
     @merge_request = create(:merge_request, :with_diffs, :simple, source_project: @project)
   end
 
diff --git a/features/steps/shared/note.rb b/features/steps/shared/note.rb
index eb6df61b8e6..444d6726f99 100644
--- a/features/steps/shared/note.rb
+++ b/features/steps/shared/note.rb
@@ -144,11 +144,4 @@ module SharedNote
       expect(page).to have_content("+1 Awesome!")
     end
   end
-
-  step 'I sort the list by "Last updated"' do
-    find('button.dropdown-toggle.btn').click
-    page.within('ul.dropdown-menu.dropdown-menu-align-right li') do
-      click_link "Last updated"
-    end
-  end
 end
diff --git a/features/steps/shared/paths.rb b/features/steps/shared/paths.rb
index 6432a786bfc..da9d1503ebc 100644
--- a/features/steps/shared/paths.rb
+++ b/features/steps/shared/paths.rb
@@ -388,13 +388,19 @@ module SharedPaths
   end
 
   step 'I visit merge request page "Bug NS-04"' do
-    mr = MergeRequest.find_by(title: "Bug NS-04")
-    visit namespace_project_merge_request_path(mr.target_project.namespace, mr.target_project, mr)
+    visit merge_request_path("Bug NS-04")
   end
 
   step 'I visit merge request page "Bug NS-05"' do
-    mr = MergeRequest.find_by(title: "Bug NS-05")
-    visit namespace_project_merge_request_path(mr.target_project.namespace, mr.target_project, mr)
+    visit merge_request_path("Bug NS-05")
+  end
+
+  step 'I visit merge request page "Bug NS-07"' do
+    visit merge_request_path("Bug NS-07")
+  end
+
+  step 'I visit merge request page "Bug NS-08"' do
+    visit merge_request_path("Bug NS-08")
   end
 
   step 'I visit merge request page "Bug CO-01"' do
@@ -503,6 +509,11 @@ module SharedPaths
     Project.find_by!(name: 'Shop')
   end
 
+  def merge_request_path(title)
+    mr = MergeRequest.find_by(title: title)
+    namespace_project_merge_request_path(mr.target_project.namespace, mr.target_project, mr)
+  end
+
   # ----------------------------------------
   # Errors
   # ----------------------------------------
diff --git a/features/support/env.rb b/features/support/env.rb
index 62c80b9c948..357d164d87f 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -14,6 +14,7 @@ require 'sidekiq/testing/inline'
 
 require_relative 'capybara'
 require_relative 'db_cleaner'
+require_relative 'rerun'
 
 %w(select2_helper test_env repo_helpers).each do |f|
   require Rails.root.join('spec', 'support', f)
diff --git a/features/support/rerun.rb b/features/support/rerun.rb
new file mode 100644
index 00000000000..8b176c5be89
--- /dev/null
+++ b/features/support/rerun.rb
@@ -0,0 +1,14 @@
+# The spinach-rerun-reporter doesn't define the on_undefined_step
+# See it here: https://github.com/javierav/spinach-rerun-reporter/blob/master/lib/spinach/reporter/rerun.rb
+module Spinach
+  class Reporter
+    class Rerun
+      def on_undefined_step(step_data, failure, step_definitions = nil)
+        super step_data, failure, step_definitions
+
+        # save feature file and scenario line
+        @rerun << "#{current_feature.filename}:#{current_scenario.line}"
+      end
+    end
+  end
+end