Merge remote-tracking branch 'origin/master' into issue_3799

16 files changed, 703 insertions, 22 deletions

diff --git a/spec/features/builds_spec.rb b/spec/features/builds_spec.rb
index 6da3a857b3f..090a941958f 100644
--- a/spec/features/builds_spec.rb
+++ b/spec/features/builds_spec.rb
@@ -86,6 +86,20 @@ describe "Builds" do
         end
       end
     end
+
+    context 'Build raw trace' do
+      before do
+        @build.run!
+        @build.trace = 'BUILD TRACE'
+        visit namespace_project_build_path(@project.namespace, @project, @build)
+      end
+
+      it do
+        page.within('.build-controls') do
+          expect(page).to have_link 'Raw'
+        end
+      end
+    end
   end
 
   describe "POST /:project/builds/:id/cancel" do
@@ -120,4 +134,20 @@ describe "Builds" do
 
     it { expect(page.response_headers['Content-Type']).to eq(artifacts_file.content_type) }
   end
+
+  describe "GET /:project/builds/:id/raw" do
+    before do
+      Capybara.current_session.driver.header('X-Sendfile-Type', 'X-Sendfile')
+      @build.run!
+      @build.trace = 'BUILD TRACE'
+      visit namespace_project_build_path(@project.namespace, @project, @build)
+    end
+
+    it 'sends the right headers' do
+      page.within('.build-controls') { click_link 'Raw' }
+
+      expect(page.response_headers['Content-Type']).to eq('text/plain; charset=utf-8')
+      expect(page.response_headers['X-Sendfile']).to eq(@build.path_to_trace)
+    end
+  end
 end
diff --git a/spec/features/issues/filter_by_labels_spec.rb b/spec/features/issues/filter_by_labels_spec.rb
new file mode 100644
index 00000000000..7f654684143
--- /dev/null
+++ b/spec/features/issues/filter_by_labels_spec.rb
@@ -0,0 +1,167 @@
+require 'rails_helper'
+
+feature 'Issue filtering by Labels', feature: true do
+  include WaitForAjax
+
+  let(:project) { create(:project, :public) }
+  let!(:user)   { create(:user)}
+  let!(:label)  { create(:label, project: project) }
+
+  before do
+    bug = create(:label, project: project, title: 'bug')
+    feature = create(:label, project: project, title: 'feature')
+    enhancement = create(:label, project: project, title: 'enhancement')
+
+    issue1 = create(:issue, title: "Bugfix1", project: project)
+    issue1.labels << bug
+
+    issue2 = create(:issue, title: "Bugfix2", project: project)
+    issue2.labels << bug
+    issue2.labels << enhancement
+
+    issue3 = create(:issue, title: "Feature1", project: project)
+    issue3.labels << feature
+
+    project.team << [user, :master]
+    login_as(user)
+
+    visit namespace_project_issues_path(project.namespace, project)
+  end
+
+  context 'filter by label bug', js: true do
+    before do
+      page.find('.js-label-select').click
+      wait_for_ajax
+      execute_script("$('.dropdown-menu-labels li:contains(\"bug\") a').click()")
+      page.first('.labels-filter .dropdown-title .dropdown-menu-close-icon').click
+      wait_for_ajax
+    end
+
+    it 'should show issue "Bugfix1" and "Bugfix2" in issues list' do
+      expect(page).to have_content "Bugfix1"
+      expect(page).to have_content "Bugfix2"
+    end
+
+    it 'should not show "Feature1" in issues list' do
+      expect(page).not_to have_content "Feature1"
+    end
+
+    it 'should show label "bug" in filtered-labels' do
+      expect(find('.filtered-labels')).to have_content "bug"
+    end
+
+    it 'should not show label "feature" and "enhancement" in filtered-labels' do
+      expect(find('.filtered-labels')).not_to have_content "feature"
+      expect(find('.filtered-labels')).not_to have_content "enhancement"
+    end
+  end
+
+  context 'filter by label feature', js: true do
+    before do
+      page.find('.js-label-select').click
+      wait_for_ajax
+      execute_script("$('.dropdown-menu-labels li:contains(\"feature\") a').click()")
+      page.first('.labels-filter .dropdown-title .dropdown-menu-close-icon').click
+      wait_for_ajax
+    end
+
+    it 'should show issue "Feature1" in issues list' do
+      expect(page).to have_content "Feature1"
+    end
+
+    it 'should not show "Bugfix1" and "Bugfix2" in issues list' do
+      expect(page).not_to have_content "Bugfix2"
+      expect(page).not_to have_content "Bugfix1"
+    end
+
+    it 'should show label "feature" in filtered-labels' do
+      expect(find('.filtered-labels')).to have_content "feature"
+    end
+
+    it 'should not show label "bug" and "enhancement" in filtered-labels' do
+      expect(find('.filtered-labels')).not_to have_content "bug"
+      expect(find('.filtered-labels')).not_to have_content "enhancement"
+    end
+  end
+
+  context 'filter by label enhancement', js: true do
+    before do
+      page.find('.js-label-select').click
+      wait_for_ajax
+      execute_script("$('.dropdown-menu-labels li:contains(\"enhancement\") a').click()")
+      page.first('.labels-filter .dropdown-title .dropdown-menu-close-icon').click
+      wait_for_ajax
+    end
+
+    it 'should show issue "Bugfix2" in issues list' do
+      expect(page).to have_content "Bugfix2"
+    end
+
+    it 'should not show "Feature1" and "Bugfix1" in issues list' do
+      expect(page).not_to have_content "Feature1"
+      expect(page).not_to have_content "Bugfix1"
+    end
+
+    it 'should show label "enhancement" in filtered-labels' do
+      expect(find('.filtered-labels')).to have_content "enhancement"
+    end
+
+    it 'should not show label "feature" and "bug" in filtered-labels' do
+      expect(find('.filtered-labels')).not_to have_content "bug"
+      expect(find('.filtered-labels')).not_to have_content "feature"
+    end
+  end
+
+  context 'filter by label enhancement or feature', js: true do
+    before do
+      page.find('.js-label-select').click
+      wait_for_ajax
+      execute_script("$('.dropdown-menu-labels li:contains(\"enhancement\") a').click()")
+      execute_script("$('.dropdown-menu-labels li:contains(\"feature\") a').click()")
+      page.first('.labels-filter .dropdown-title .dropdown-menu-close-icon').click
+      wait_for_ajax
+    end
+
+    it 'should not show "Bugfix1" or "Feature1" in issues list' do
+      expect(page).not_to have_content "Bugfix1"
+      expect(page).not_to have_content "Feature1"
+    end
+
+    it 'should show label "enhancement" and "feature" in filtered-labels' do
+      expect(find('.filtered-labels')).to have_content "enhancement"
+      expect(find('.filtered-labels')).to have_content "feature"
+    end
+
+    it 'should not show label "bug" in filtered-labels' do
+      expect(find('.filtered-labels')).not_to have_content "bug"
+    end
+  end
+
+  context 'filter by label enhancement and bug in issues list', js: true do
+    before do
+      page.find('.js-label-select').click
+      wait_for_ajax
+      execute_script("$('.dropdown-menu-labels li:contains(\"enhancement\") a').click()")
+      execute_script("$('.dropdown-menu-labels li:contains(\"bug\") a').click()")
+      page.first('.labels-filter .dropdown-title .dropdown-menu-close-icon').click
+      wait_for_ajax
+    end
+
+    it 'should show issue "Bugfix2" in issues list' do
+      expect(page).to have_content "Bugfix2"
+    end
+
+    it 'should not show "Feature1"' do
+      expect(page).not_to have_content "Feature1"
+    end
+
+    it 'should show label "bug" and "enhancement" in filtered-labels' do
+      expect(find('.filtered-labels')).to have_content "bug"
+      expect(find('.filtered-labels')).to have_content "enhancement"
+    end
+
+    it 'should not show label "feature" in filtered-labels' do
+      expect(find('.filtered-labels')).not_to have_content "feature"
+    end
+  end
+end
diff --git a/spec/features/issues/filter_issues_spec.rb b/spec/features/issues/filter_issues_spec.rb
index 69b22232f10..192e3619375 100644
--- a/spec/features/issues/filter_issues_spec.rb
+++ b/spec/features/issues/filter_issues_spec.rb
@@ -84,14 +84,20 @@ describe 'Filter issues', feature: true do
 
     it 'should filter by any label' do
       find('.dropdown-menu-labels a', text: 'Any Label').click
+      page.first('.labels-filter .dropdown-title .dropdown-menu-close-icon').click
+      sleep 2
+
       page.within '.labels-filter' do
         expect(page).to have_content 'Any Label'
       end
-      expect(find('.js-label-select .dropdown-toggle-text')).to have_content('Label')
+      expect(find('.js-label-select .dropdown-toggle-text')).to have_content('Any Label')
     end
 
     it 'should filter by no label' do
       find('.dropdown-menu-labels a', text: 'No Label').click
+      page.first('.labels-filter .dropdown-title .dropdown-menu-close-icon').click
+      sleep 2
+
       page.within '.labels-filter' do
         expect(page).to have_content 'No Label'
       end
@@ -121,6 +127,7 @@ describe 'Filter issues', feature: true do
       find('.js-label-select').click
 
       find('.dropdown-menu-labels .dropdown-content a', text: label.title).click
+      page.first('.labels-filter .dropdown-title .dropdown-menu-close-icon').click
 
       sleep 2
     end
diff --git a/spec/features/issues/issue_sidebar_spec.rb b/spec/features/issues/issue_sidebar_spec.rb
new file mode 100644
index 00000000000..5739bc64dfb
--- /dev/null
+++ b/spec/features/issues/issue_sidebar_spec.rb
@@ -0,0 +1,79 @@
+require 'rails_helper'
+
+feature 'Issue Sidebar', feature: true do
+  let(:project) { create(:project) }
+  let(:issue) { create(:issue, project: project) }
+  let!(:user) { create(:user)}
+
+  before do
+    create(:label, project: project, title: 'bug')
+    login_as(user)
+  end
+
+  context 'as a allowed user' do
+    before do
+      project.team << [user, :developer]
+      visit_issue(project, issue)
+    end
+
+    describe 'when clicking on edit labels', js: true do
+      it 'dropdown has an option to create a new label' do
+        find('.block.labels .edit-link').click
+
+        page.within('.block.labels') do
+          expect(page).to have_content 'Create new'
+        end
+      end
+    end
+
+    context 'creating a new label', js: true do
+      it 'option to crate a new label is present' do
+        page.within('.block.labels') do
+          find('.edit-link').click
+
+          expect(page).to have_content 'Create new'
+        end
+      end
+
+      it 'dropdown switches to "create label" section' do
+        page.within('.block.labels') do
+          find('.edit-link').click
+          click_link 'Create new'
+
+          expect(page).to have_content 'Create new label'
+        end
+      end
+
+      it 'new label is added' do
+        page.within('.block.labels') do
+          find('.edit-link').click
+          sleep 1
+          click_link 'Create new'
+
+          fill_in 'new_label_name', with: 'wontfix'
+          page.find(".suggest-colors a", match: :first).click
+          click_button 'Create'
+
+          page.within('.dropdown-page-one') do
+            expect(page).to have_content 'wontfix'
+          end
+        end
+      end
+    end
+  end
+
+  context 'as a guest' do
+    before do
+      project.team << [user, :guest]
+      visit_issue(project, issue)
+    end
+
+    it 'does not have a option to edit labels' do
+      expect(page).not_to have_selector('.block.labels .edit-link')
+    end
+  end
+
+  def visit_issue(project, issue)
+    visit namespace_project_issue_path(project.namespace, project, issue)
+  end
+end
diff --git a/spec/features/issues/update_issues_spec.rb b/spec/features/issues/update_issues_spec.rb
index 3eb903a93fe..b03dd0f666d 100644
--- a/spec/features/issues/update_issues_spec.rb
+++ b/spec/features/issues/update_issues_spec.rb
@@ -48,7 +48,7 @@ feature 'Multiple issue updating from issues#index', feature: true do
       click_update_issues_button
 
       page.within('.issue .controls') do
-        expect(find('.author_link')["data-original-title"]).to have_content(user.name)
+        expect(find('.author_link')["title"]).to have_content(user.name)
       end
     end
 
diff --git a/spec/features/issues_spec.rb b/spec/features/issues_spec.rb
index 35c8f93abc1..90476ab369b 100644
--- a/spec/features/issues_spec.rb
+++ b/spec/features/issues_spec.rb
@@ -112,7 +112,7 @@ describe 'Issues', feature: true do
   end
 
   describe 'filter issue' do
-    titles = ['foo','bar','baz']
+    titles = %w[foo bar baz]
     titles.each_with_index do |title, index|
       let!(title.to_sym) do
         create(:issue, title: title,
@@ -153,8 +153,94 @@ describe 'Issues', feature: true do
       expect(first_issue).to include('baz')
     end
 
+    describe 'sorting by due date' do
+      before do
+        foo.update(due_date: 1.day.from_now)
+        bar.update(due_date: 6.days.from_now)
+      end
+
+      it 'sorts by recently due date' do
+        visit namespace_project_issues_path(project.namespace, project, sort: sort_value_due_date_soon)
+
+        expect(first_issue).to include('foo')
+      end
+
+      it 'sorts by least recently due date' do
+        visit namespace_project_issues_path(project.namespace, project, sort: sort_value_due_date_later)
+
+        expect(first_issue).to include('bar')
+      end
+
+      it 'sorts by least recently due date by excluding nil due dates' do
+        bar.update(due_date: nil)
+
+        visit namespace_project_issues_path(project.namespace, project, sort: sort_value_due_date_later)
+
+        expect(first_issue).to include('foo')
+      end
+    end
+
+    describe 'filtering by due date' do
+      before do
+        foo.update(due_date: 1.day.from_now)
+        bar.update(due_date: 6.days.from_now)
+      end
+
+      it 'filters by none' do
+        visit namespace_project_issues_path(project.namespace, project, due_date: Issue::NoDueDate.name)
+
+        expect(page).not_to have_content('foo')
+        expect(page).not_to have_content('bar')
+        expect(page).to have_content('baz')
+      end
+
+      it 'filters by any' do
+        visit namespace_project_issues_path(project.namespace, project, due_date: Issue::AnyDueDate.name)
+
+        expect(page).to have_content('foo')
+        expect(page).to have_content('bar')
+        expect(page).to have_content('baz')
+      end
+
+      it 'filters by due this week' do
+        foo.update(due_date: Date.today.beginning_of_week + 2.days)
+        bar.update(due_date: Date.today.end_of_week)
+        baz.update(due_date: Date.today - 8.days)
+
+        visit namespace_project_issues_path(project.namespace, project, due_date: Issue::DueThisWeek.name)
+
+        expect(page).to have_content('foo')
+        expect(page).to have_content('bar')
+        expect(page).not_to have_content('baz')
+      end
+
+      it 'filters by due this month' do
+        foo.update(due_date: Date.today.beginning_of_month + 2.days)
+        bar.update(due_date: Date.today.end_of_month)
+        baz.update(due_date: Date.today - 50.days)
+
+        visit namespace_project_issues_path(project.namespace, project, due_date: Issue::DueThisMonth.name)
+
+        expect(page).to have_content('foo')
+        expect(page).to have_content('bar')
+        expect(page).not_to have_content('baz')
+      end
+
+      it 'filters by overdue' do
+        foo.update(due_date: Date.today + 2.days)
+        bar.update(due_date: Date.today + 20.days)
+        baz.update(due_date: Date.yesterday)
+
+        visit namespace_project_issues_path(project.namespace, project, due_date: Issue::Overdue.name)
+
+        expect(page).not_to have_content('foo')
+        expect(page).not_to have_content('bar')
+        expect(page).to have_content('baz')
+      end
+    end
+
     describe 'sorting by milestone' do
-      before :each do
+      before do
         foo.milestone = newer_due_milestone
         foo.save
         bar.milestone = later_due_milestone
@@ -177,7 +263,7 @@ describe 'Issues', feature: true do
     describe 'combine filter and sort' do
       let(:user2) { create(:user) }
 
-      before :each do
+      before do
         foo.assignee = user2
         foo.save
         bar.assignee = user2
@@ -224,7 +310,7 @@ describe 'Issues', feature: true do
 
       let(:guest) { create(:user) }
 
-      before :each do
+      before do
         project.team << [[guest], :guest]
       end
 
@@ -267,7 +353,7 @@ describe 'Issues', feature: true do
     context 'by unauthorized user' do
       let(:guest) { create(:user) }
 
-      before :each do
+      before do
         project.team << [guest, :guest]
         issue.milestone = milestone
         issue.save
@@ -285,7 +371,7 @@ describe 'Issues', feature: true do
     describe 'removing assignee' do
       let(:user2) { create(:user) }
 
-      before :each do
+      before do
         issue.assignee = user2
         issue.save
       end
diff --git a/spec/features/merge_requests/cherry_pick_spec.rb b/spec/features/merge_requests/cherry_pick_spec.rb
new file mode 100644
index 00000000000..82bc5226d07
--- /dev/null
+++ b/spec/features/merge_requests/cherry_pick_spec.rb
@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+describe 'Cherry-pick Merge Requests' do
+  let(:user) { create(:user) }
+  let(:project) { create(:project) }
+  let(:merge_request) { create(:merge_request_with_diffs, source_project: project, author: user) }
+
+  before do
+    login_as user
+    project.team << [user, :master]
+  end
+
+  context "Viewing a merged merge request" do
+    before do
+      service = MergeRequests::MergeService.new(project, user)
+
+      perform_enqueued_jobs do
+        service.execute(merge_request)
+      end
+    end
+
+    # Fast-forward merge, or merged before GitLab 8.5.
+    context "Without a merge commit" do
+      before do
+        merge_request.merge_commit_sha = nil
+        merge_request.save
+      end
+
+      it "doesn't show a Cherry-pick button" do
+        visit namespace_project_merge_request_path(project.namespace, project, merge_request)
+
+        expect(page).not_to have_link "Cherry-pick"
+      end
+    end
+
+    context "With a merge commit" do
+      it "shows a Cherry-pick button" do
+        visit namespace_project_merge_request_path(project.namespace, project, merge_request)
+
+        expect(page).to have_link "Cherry-pick"
+      end
+    end
+  end
+end
diff --git a/spec/features/merge_requests/filter_by_milestone_spec.rb b/spec/features/merge_requests/filter_by_milestone_spec.rb
index c57ab5f3b03..e3ecd60a5f3 100644
--- a/spec/features/merge_requests/filter_by_milestone_spec.rb
+++ b/spec/features/merge_requests/filter_by_milestone_spec.rb
@@ -2,8 +2,14 @@ require 'rails_helper'
 
 feature 'Merge Request filtering by Milestone', feature: true do
   let(:project)   { create(:project, :public) }
+  let!(:user)     { create(:user)}
   let(:milestone) { create(:milestone, project: project) }
 
+  before do
+    project.team << [user, :master]
+    login_as(user)
+  end
+
   scenario 'filters by no Milestone', js: true do
     create(:merge_request, :with_diffs, source_project: project)
     create(:merge_request, :simple, source_project: project, milestone: milestone)
diff --git a/spec/features/project/commits/cherry_pick_spec.rb b/spec/features/project/commits/cherry_pick_spec.rb
new file mode 100644
index 00000000000..0559b02f321
--- /dev/null
+++ b/spec/features/project/commits/cherry_pick_spec.rb
@@ -0,0 +1,67 @@
+require 'spec_helper'
+
+describe 'Cherry-pick Commits' do
+  let(:project) { create(:project) }
+  let(:master_pickable_commit)  { project.commit('7d3b0f7cff5f37573aea97cebfd5692ea1689924') }
+  let(:master_pickable_merge)  { project.commit('e56497bb5f03a90a51293fc6d516788730953899') }
+
+
+  before do
+    login_as :user
+    project.team << [@user, :master]
+    visit namespace_project_commits_path(project.namespace, project, project.repository.root_ref, { limit: 5 })
+  end
+
+  context "I cherry-pick a commit" do
+    it do
+      visit namespace_project_commit_path(project.namespace, project, master_pickable_commit.id)
+      find("a[href='#modal-cherry-pick-commit']").click
+      page.within('#modal-cherry-pick-commit') do
+        uncheck 'create_merge_request'
+        click_button 'Cherry-pick'
+      end
+      expect(page).to have_content('The commit has been successfully cherry-picked.')
+    end
+  end
+
+  context "I cherry-pick a merge commit" do
+    it do
+      visit namespace_project_commit_path(project.namespace, project, master_pickable_merge.id)
+      find("a[href='#modal-cherry-pick-commit']").click
+      page.within('#modal-cherry-pick-commit') do
+        uncheck 'create_merge_request'
+        click_button 'Cherry-pick'
+      end
+      expect(page).to have_content('The commit has been successfully cherry-picked.')
+    end
+  end
+
+  context "I cherry-pick a commit that was previously cherry-picked" do
+    it do
+      visit namespace_project_commit_path(project.namespace, project, master_pickable_commit.id)
+      find("a[href='#modal-cherry-pick-commit']").click
+      page.within('#modal-cherry-pick-commit') do
+        uncheck 'create_merge_request'
+        click_button 'Cherry-pick'
+      end
+      visit namespace_project_commit_path(project.namespace, project, master_pickable_commit.id)
+      find("a[href='#modal-cherry-pick-commit']").click
+      page.within('#modal-cherry-pick-commit') do
+        uncheck 'create_merge_request'
+        click_button 'Cherry-pick'
+      end
+      expect(page).to have_content('Sorry, we cannot cherry-pick this commit automatically.')
+    end
+  end
+
+  context "I cherry-pick a commit in a new merge request" do
+    it do
+      visit namespace_project_commit_path(project.namespace, project, master_pickable_commit.id)
+      find("a[href='#modal-cherry-pick-commit']").click
+      page.within('#modal-cherry-pick-commit') do
+        click_button 'Cherry-pick'
+      end
+      expect(page).to have_content('The commit has been successfully cherry-picked. You can now submit a merge request to get this change into the original branch.')
+    end
+  end
+end
diff --git a/spec/features/projects/files/project_owner_creates_license_file_spec.rb b/spec/features/projects/files/project_owner_creates_license_file_spec.rb
new file mode 100644
index 00000000000..3d6ffbc4c6b
--- /dev/null
+++ b/spec/features/projects/files/project_owner_creates_license_file_spec.rb
@@ -0,0 +1,61 @@
+require 'spec_helper'
+
+feature 'project owner creates a license file', feature: true, js: true do
+  include Select2Helper
+
+  let(:project_master) { create(:user) }
+  let(:project) { create(:project) }
+  background do
+    project.repository.remove_file(project_master, 'LICENSE', 'Remove LICENSE', 'master')
+    project.team << [project_master, :master]
+    login_as(project_master)
+    visit namespace_project_path(project.namespace, project)
+  end
+
+  scenario 'project master creates a license file manually from a template' do
+    visit namespace_project_tree_path(project.namespace, project, project.repository.root_ref)
+    find('.add-to-tree').click
+    click_link 'New file'
+
+    fill_in :file_name, with: 'LICENSE'
+
+    expect(page).to have_selector('.license-selector')
+
+    select2('mit', from: '#license_type')
+
+    file_content = find('.file-content')
+    expect(file_content).to have_content('The MIT License (MIT)')
+    expect(file_content).to have_content("Copyright (c) 2016 #{project.namespace.human_name}")
+
+    fill_in :commit_message, with: 'Add a LICENSE file', visible: true
+    click_button 'Commit Changes'
+
+    expect(current_path).to eq(
+      namespace_project_blob_path(project.namespace, project, 'master/LICENSE'))
+    expect(page).to have_content('The MIT License (MIT)')
+    expect(page).to have_content("Copyright (c) 2016 #{project.namespace.human_name}")
+  end
+
+  scenario 'project master creates a license file from the "Add license" link' do
+    click_link 'Add License'
+
+    expect(current_path).to eq(
+      namespace_project_new_blob_path(project.namespace, project, 'master'))
+    expect(find('#file_name').value).to eq('LICENSE')
+    expect(page).to have_selector('.license-selector')
+
+    select2('mit', from: '#license_type')
+
+    file_content = find('.file-content')
+    expect(file_content).to have_content('The MIT License (MIT)')
+    expect(file_content).to have_content("Copyright (c) 2016 #{project.namespace.human_name}")
+
+    fill_in :commit_message, with: 'Add a LICENSE file', visible: true
+    click_button 'Commit Changes'
+
+    expect(current_path).to eq(
+      namespace_project_blob_path(project.namespace, project, 'master/LICENSE'))
+    expect(page).to have_content('The MIT License (MIT)')
+    expect(page).to have_content("Copyright (c) 2016 #{project.namespace.human_name}")
+  end
+end
diff --git a/spec/features/projects/files/project_owner_sees_link_to_create_license_file_in_empty_project_spec.rb b/spec/features/projects/files/project_owner_sees_link_to_create_license_file_in_empty_project_spec.rb
new file mode 100644
index 00000000000..3268e240200
--- /dev/null
+++ b/spec/features/projects/files/project_owner_sees_link_to_create_license_file_in_empty_project_spec.rb
@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+feature 'project owner sees a link to create a license file in empty project', feature: true, js: true do
+  include Select2Helper
+
+  let(:project_master) { create(:user) }
+  let(:project) { create(:empty_project) }
+  background do
+    project.team << [project_master, :master]
+    login_as(project_master)
+  end
+
+  scenario 'project master creates a license file from a template' do
+    visit namespace_project_path(project.namespace, project)
+    click_link 'Create empty bare repository'
+    click_on 'LICENSE'
+
+    expect(current_path).to eq(
+      namespace_project_new_blob_path(project.namespace, project, 'master'))
+    expect(find('#file_name').value).to eq('LICENSE')
+    expect(page).to have_selector('.license-selector')
+
+    select2('mit', from: '#license_type')
+
+    file_content = find('.file-content')
+    expect(file_content).to have_content('The MIT License (MIT)')
+    expect(file_content).to have_content("Copyright (c) 2016 #{project.namespace.human_name}")
+
+    fill_in :commit_message, with: 'Add a LICENSE file', visible: true
+    # Remove pre-receive hook so we can push without auth
+    FileUtils.rm_f(File.join(project.repository.path, 'hooks', 'pre-receive'))
+    click_button 'Commit Changes'
+
+    expect(current_path).to eq(
+      namespace_project_blob_path(project.namespace, project, 'master/LICENSE'))
+    expect(page).to have_content('The MIT License (MIT)')
+    expect(page).to have_content("Copyright (c) 2016 #{project.namespace.human_name}")
+  end
+end
diff --git a/spec/features/runners_spec.rb b/spec/features/runners_spec.rb
index e8886e7edf9..8edeb8d18af 100644
--- a/spec/features/runners_spec.rb
+++ b/spec/features/runners_spec.rb
@@ -80,6 +80,22 @@ describe "Runners" do
     end
   end
 
+  describe "shared runners description" do
+    let(:shared_runners_text) { 'custom **shared** runners description' }
+    let(:shared_runners_html) { 'custom shared runners description' }
+
+    before do
+      stub_application_setting(shared_runners_text: shared_runners_text)
+      project = FactoryGirl.create :empty_project, shared_runners_enabled: false
+      project.team << [user, :master]
+      visit runners_path(project)
+    end
+
+    it "sees shared runners description" do
+      expect(page.find(".shared-runners-description")).to have_content(shared_runners_html)
+    end
+  end
+
   describe "show page" do
     before do
       @project = FactoryGirl.create :empty_project
diff --git a/spec/features/security/project/internal_access_spec.rb b/spec/features/security/project/internal_access_spec.rb
index 79d5bf4cf06..8625ea6bc10 100644
--- a/spec/features/security/project/internal_access_spec.rb
+++ b/spec/features/security/project/internal_access_spec.rb
@@ -101,12 +101,12 @@ describe "Internal Project Access", feature: true  do
     it { is_expected.to be_allowed_for :admin }
     it { is_expected.to be_allowed_for owner }
     it { is_expected.to be_allowed_for master }
-    it { is_expected.to be_denied_for developer }
-    it { is_expected.to be_denied_for reporter }
-    it { is_expected.to be_denied_for guest }
-    it { is_expected.to be_denied_for :user }
-    it { is_expected.to be_denied_for :external }
+    it { is_expected.to be_allowed_for developer }
+    it { is_expected.to be_allowed_for reporter }
+    it { is_expected.to be_allowed_for guest }
+    it { is_expected.to be_allowed_for :user }
     it { is_expected.to be_denied_for :visitor }
+    it { is_expected.to be_denied_for :external }
   end
 
   describe "GET /:project_path/blob" do
diff --git a/spec/features/security/project/private_access_spec.rb b/spec/features/security/project/private_access_spec.rb
index 0a89193eb67..544270b4037 100644
--- a/spec/features/security/project/private_access_spec.rb
+++ b/spec/features/security/project/private_access_spec.rb
@@ -101,9 +101,9 @@ describe "Private Project Access", feature: true  do
     it { is_expected.to be_allowed_for :admin }
     it { is_expected.to be_allowed_for owner }
     it { is_expected.to be_allowed_for master }
-    it { is_expected.to be_denied_for developer }
-    it { is_expected.to be_denied_for reporter }
-    it { is_expected.to be_denied_for guest }
+    it { is_expected.to be_allowed_for developer }
+    it { is_expected.to be_allowed_for reporter }
+    it { is_expected.to be_allowed_for guest }
     it { is_expected.to be_denied_for :user }
     it { is_expected.to be_denied_for :external }
     it { is_expected.to be_denied_for :visitor }
diff --git a/spec/features/security/project/public_access_spec.rb b/spec/features/security/project/public_access_spec.rb
index 40daac89d40..4def4f99bc0 100644
--- a/spec/features/security/project/public_access_spec.rb
+++ b/spec/features/security/project/public_access_spec.rb
@@ -101,12 +101,12 @@ describe "Public Project Access", feature: true  do
     it { is_expected.to be_allowed_for :admin }
     it { is_expected.to be_allowed_for owner }
     it { is_expected.to be_allowed_for master }
-    it { is_expected.to be_denied_for developer }
-    it { is_expected.to be_denied_for reporter }
-    it { is_expected.to be_denied_for guest }
-    it { is_expected.to be_denied_for :user }
-    it { is_expected.to be_denied_for :external }
-    it { is_expected.to be_denied_for :visitor }
+    it { is_expected.to be_allowed_for developer }
+    it { is_expected.to be_allowed_for reporter }
+    it { is_expected.to be_allowed_for guest }
+    it { is_expected.to be_allowed_for :user }
+    it { is_expected.to be_allowed_for :visitor }
+    it { is_expected.to be_allowed_for :external }
   end
 
   describe "GET /:project_path/builds" do
diff --git a/spec/features/todos/todos_spec.rb b/spec/features/todos/todos_spec.rb
new file mode 100644
index 00000000000..113d4c40cfc
--- /dev/null
+++ b/spec/features/todos/todos_spec.rb
@@ -0,0 +1,79 @@
+require 'spec_helper'
+
+describe 'Dashboard Todos', feature: true do
+  let(:user){ create(:user) }
+  let(:author){ create(:user) }
+  let(:project){ create(:project) }
+  let(:issue){ create(:issue) }
+  let(:todos_per_page){ Todo.default_per_page }
+  let(:todos_total){ todos_per_page + 1 }
+
+  describe 'GET /dashboard/todos' do
+    context 'User does not have todos' do
+      before do
+        login_as(user)
+        visit dashboard_todos_path
+      end
+      it 'shows "All done" message' do
+        expect(page).to have_content "You're all done!"
+      end
+    end
+
+    context 'User has a todo', js: true do
+      before do
+        create(:todo, :mentioned, user: user, project: project, target: issue, author: author)
+        login_as(user)
+        visit dashboard_todos_path
+      end
+
+      it 'todo is present' do
+        expect(page).to have_selector('.todos-list .todo', count: 1)
+      end
+
+      describe 'deleting the todo' do
+        before do
+          first('.done-todo').click
+        end
+
+        it 'is removed from the list' do
+          expect(page).not_to have_selector('.todos-list .todo')
+        end
+
+        it 'shows "All done" message' do
+          expect(page).to have_content("You're all done!")
+        end
+      end
+    end
+
+    context 'User has multiple pages of Todos' do
+      let(:todo_total_pages){ (todos_total.to_f/todos_per_page).ceil }
+
+      before do
+        todos_total.times do
+          create(:todo, :mentioned, user: user, project: project, target: issue, author: author)
+        end
+
+        login_as(user)
+        visit dashboard_todos_path
+      end
+
+      it 'is paginated' do
+        expect(page).to have_selector('.gl-pagination')
+      end
+
+      it 'is has the right number of pages' do
+        expect(page).to have_selector('.gl-pagination .page', count: todo_total_pages)
+      end
+
+      describe 'deleting last todo from last page', js: true do
+        it 'redirects to the previous page' do
+          page.within('.gl-pagination') do
+            click_link todo_total_pages.to_s
+          end
+          first('.done-todo').click
+          expect(page).to have_content(Todo.last.body)
+        end
+      end
+    end
+  end
+end