Merge branch 'master' into sh-headless-chrome-support

53 files changed, 1578 insertions, 473 deletions

diff --git a/spec/features/admin/admin_active_tab_spec.rb b/spec/features/admin/admin_active_tab_spec.rb
index 5ff791fc36a..1215908f5ea 100644
--- a/spec/features/admin/admin_active_tab_spec.rb
+++ b/spec/features/admin/admin_active_tab_spec.rb
@@ -14,8 +14,8 @@ RSpec.describe 'admin active tab' do
 
   shared_examples 'page has active sub tab' do |title|
     it "activates #{title} sub tab" do
-      expect(page).to have_selector('.sidebar-sub-level-items li.active', count: 1)
-      expect(page.find('.sidebar-sub-level-items li.active')).to have_content(title)
+      expect(page).to have_selector('.sidebar-sub-level-items > li.active', count: 2)
+      expect(page.all('.sidebar-sub-level-items > li.active')[1]).to have_content(title)
     end
   end
 
diff --git a/spec/features/admin/admin_browses_logs_spec.rb b/spec/features/admin/admin_browses_logs_spec.rb
index 3e3404dfdac..02f50d7e27f 100644
--- a/spec/features/admin/admin_browses_logs_spec.rb
+++ b/spec/features/admin/admin_browses_logs_spec.rb
@@ -8,8 +8,10 @@ describe 'Admin browses logs' do
   it 'shows available log files' do
     visit admin_logs_path
 
-    expect(page).to have_content 'test.log'
-    expect(page).to have_content 'githost.log'
-    expect(page).to have_content 'application.log'
+    expect(page).to have_link 'application.log'
+    expect(page).to have_link 'githost.log'
+    expect(page).to have_link 'test.log'
+    expect(page).to have_link 'sidekiq.log'
+    expect(page).to have_link 'repocheck.log'
   end
 end
diff --git a/spec/features/admin/admin_settings_spec.rb b/spec/features/admin/admin_settings_spec.rb
index 563818e8761..c490dce7ab0 100644
--- a/spec/features/admin/admin_settings_spec.rb
+++ b/spec/features/admin/admin_settings_spec.rb
@@ -48,7 +48,7 @@ feature 'Admin updates settings' do
   end
 
   scenario 'Change Slack Notifications Service template settings' do
-    click_link 'Service Templates'
+    first(:link, 'Service Templates').click
     click_link 'Slack notifications'
     fill_in 'Webhook', with: 'http://localhost'
     fill_in 'Username', with: 'test_user'
diff --git a/spec/features/boards/boards_spec.rb b/spec/features/boards/boards_spec.rb
index e010b5f3444..33aca6cb527 100644
--- a/spec/features/boards/boards_spec.rb
+++ b/spec/features/boards/boards_spec.rb
@@ -13,7 +13,7 @@ describe 'Issue Boards', js: true do
     project.team << [user, :master]
     project.team << [user2, :master]
 
-    allow_any_instance_of(ApplicationHelper).to receive(:collapsed_sidebar?).and_return(true)
+    page.driver.set_cookie('sidebar_collapsed', 'true')
 
     sign_in(user)
   end
diff --git a/spec/features/copy_as_gfm_spec.rb b/spec/features/copy_as_gfm_spec.rb
index 3e6a27eafd8..dfeba722ac6 100644
--- a/spec/features/copy_as_gfm_spec.rb
+++ b/spec/features/copy_as_gfm_spec.rb
@@ -288,8 +288,6 @@ describe 'Copy as GFM', js: true do
         'SanitizationFilter',
 
         <<-GFM.strip_heredoc
-        <a name="named-anchor"></a>
-
         <sub>sub</sub>
 
         <dl>
diff --git a/spec/features/dashboard/issues_filter_spec.rb b/spec/features/dashboard/issues_filter_spec.rb
index ebc3d196118..facb67ae787 100644
--- a/spec/features/dashboard/issues_filter_spec.rb
+++ b/spec/features/dashboard/issues_filter_spec.rb
@@ -50,7 +50,7 @@ feature 'Dashboard Issues filtering', :js do
     it 'updates atom feed link' do
       visit_issues(milestone_title: '', assignee_id: user.id)
 
-      link = find('.breadcrumbs a[title="Subscribe"]')
+      link = find('.nav-controls a[title="Subscribe"]')
       params = CGI.parse(URI.parse(link[:href]).query)
       auto_discovery_link = find('link[type="application/atom+xml"]', visible: false)
       auto_discovery_params = CGI.parse(URI.parse(auto_discovery_link[:href]).query)
diff --git a/spec/features/dashboard/projects_spec.rb b/spec/features/dashboard/projects_spec.rb
index 06a43909053..9a7b8e3ba6b 100644
--- a/spec/features/dashboard/projects_spec.rb
+++ b/spec/features/dashboard/projects_spec.rb
@@ -83,26 +83,14 @@ feature 'Dashboard Projects' do
     end
   end
 
-  context 'last push widget' do
-    let(:push_event_data) do
-      {
-        before: Gitlab::Git::BLANK_SHA,
-        after: '0220c11b9a3e6c69dc8fd35321254ca9a7b98f7e',
-        ref: 'refs/heads/feature',
-        user_id: user.id,
-        user_name: user.name,
-        repository: {
-          name: project.name,
-          url: 'localhost/rubinius',
-          description: '',
-          homepage: 'localhost/rubinius',
-          private: true
-        }
-      }
-    end
-    let!(:push_event) { create(:event, :pushed, data: push_event_data, project: project, author: user) }
-
+  context 'last push widget', :use_clean_rails_memory_store_caching do
     before do
+      event = create(:push_event, project: project, author: user)
+
+      create(:push_event_payload, event: event, ref: 'feature', action: :created)
+
+      Users::LastPushEventService.new(user).cache_last_push_event(event)
+
       visit dashboard_projects_path
     end
 
@@ -115,9 +103,9 @@ feature 'Dashboard Projects' do
 
       expect(page).to have_selector('.merge-request-form')
       expect(current_path).to eq project_new_merge_request_path(project)
-      expect(find('#merge_request_target_project_id').value).to eq project.id.to_s
-      expect(find('input#merge_request_source_branch').value).to eq 'feature'
-      expect(find('input#merge_request_target_branch').value).to eq 'master'
+      expect(find('#merge_request_target_project_id', visible: false).value).to eq project.id.to_s
+      expect(find('input#merge_request_source_branch', visible: false).value).to eq 'feature'
+      expect(find('input#merge_request_target_branch', visible: false).value).to eq 'master'
     end
   end
 end
diff --git a/spec/features/groups/members/request_access_spec.rb b/spec/features/groups/members/request_access_spec.rb
index 1f3c7fd3859..10389a74703 100644
--- a/spec/features/groups/members/request_access_spec.rb
+++ b/spec/features/groups/members/request_access_spec.rb
@@ -51,7 +51,7 @@ feature 'Groups > Members > Request access' do
 
     expect(group.requesters.exists?(user_id: user)).to be_truthy
 
-    click_link 'Members'
+    first(:link, 'Members').click
 
     page.within('.content') do
       expect(page).not_to have_content(user.name)
diff --git a/spec/features/groups/share_lock_spec.rb b/spec/features/groups/share_lock_spec.rb
new file mode 100644
index 00000000000..8842d1391aa
--- /dev/null
+++ b/spec/features/groups/share_lock_spec.rb
@@ -0,0 +1,62 @@
+require 'spec_helper'
+
+feature 'Group share with group lock' do
+  given(:root_owner) { create(:user) }
+  given(:root_group) { create(:group) }
+
+  background do
+    root_group.add_owner(root_owner)
+    sign_in(root_owner)
+  end
+
+  context 'with a subgroup', :nested_groups do
+    given!(:subgroup) { create(:group, parent: root_group) }
+
+    context 'when enabling the parent group share with group lock' do
+      scenario 'the subgroup share with group lock becomes enabled' do
+        visit edit_group_path(root_group)
+        check 'group_share_with_group_lock'
+
+        click_on 'Save group'
+
+        expect(subgroup.reload.share_with_group_lock?).to be_truthy
+      end
+    end
+
+    context 'when disabling the parent group share with group lock (which was already enabled)' do
+      background do
+        visit edit_group_path(root_group)
+        check 'group_share_with_group_lock'
+        click_on 'Save group'
+      end
+
+      context 'and the subgroup share with group lock is enabled' do
+        scenario 'the subgroup share with group lock does not change' do
+          visit edit_group_path(root_group)
+          uncheck 'group_share_with_group_lock'
+
+          click_on 'Save group'
+
+          expect(subgroup.reload.share_with_group_lock?).to be_truthy
+        end
+      end
+
+      context 'but the subgroup share with group lock is disabled' do
+        background do
+          visit edit_group_path(subgroup)
+          uncheck 'group_share_with_group_lock'
+          click_on 'Save group'
+        end
+
+        scenario 'the subgroup share with group lock does not change' do
+          visit edit_group_path(root_group)
+          uncheck 'group_share_with_group_lock'
+
+          click_on 'Save group'
+
+          expect(subgroup.reload.share_with_group_lock?).to be_falsey
+        end
+      end
+    end
+  end
+end
diff --git a/spec/features/issues/filtered_search/visual_tokens_spec.rb b/spec/features/issues/filtered_search/visual_tokens_spec.rb
index 4ae54fd6f4e..2b624f4842d 100644
--- a/spec/features/issues/filtered_search/visual_tokens_spec.rb
+++ b/spec/features/issues/filtered_search/visual_tokens_spec.rb
@@ -28,7 +28,7 @@ describe 'Visual tokens', js: true do
     sign_in(user)
     create(:issue, project: project)
 
-    allow_any_instance_of(ApplicationHelper).to receive(:collapsed_sidebar?).and_return(true)
+    page.driver.set_cookie('sidebar_collapsed', 'true')
 
     visit project_issues_path(project)
   end
diff --git a/spec/features/issues/form_spec.rb b/spec/features/issues/form_spec.rb
index 4297bfff3d9..2db6f9a2982 100644
--- a/spec/features/issues/form_spec.rb
+++ b/spec/features/issues/form_spec.rb
@@ -166,12 +166,10 @@ describe 'New/edit issue', :js do
         end
       end
 
-      page.within '.issuable-meta' do
+      page.within '.breadcrumbs' do
         issue = Issue.find_by(title: 'title')
 
-        expect(page).to have_text("Issue #{issue.to_reference}")
-        # compare paths because the host differ in test
-        expect(find_link(issue.to_reference)[:href]).to end_with(issue_path(issue))
+        expect(page).to have_text("Issues #{issue.to_reference}")
       end
     end
 
diff --git a/spec/features/issues/issue_detail_spec.rb b/spec/features/issues/issue_detail_spec.rb
index c470cb7c716..28b636f9359 100644
--- a/spec/features/issues/issue_detail_spec.rb
+++ b/spec/features/issues/issue_detail_spec.rb
@@ -40,18 +40,4 @@ feature 'Issue Detail', :js do
       end
     end
   end
-
-  context 'when authored by a user who is later deleted' do
-    before do
-      issue.update_attribute(:author_id, nil)
-      sign_in(user)
-      visit project_issue_path(project, issue)
-    end
-
-    it 'shows the issue' do
-      page.within('.issuable-details') do
-        expect(find('h2')).to have_content(issue.title)
-      end
-    end
-  end
 end
diff --git a/spec/features/issues_spec.rb b/spec/features/issues_spec.rb
index 6c070e44269..387288c8390 100644
--- a/spec/features/issues_spec.rb
+++ b/spec/features/issues_spec.rb
@@ -577,7 +577,7 @@ describe 'Issues' do
       it 'redirects to signin then back to new issue after signin' do
         visit project_issues_path(project)
 
-        page.within '.breadcrumbs' do
+        page.within '.nav-controls' do
           click_link 'New issue'
         end
 
diff --git a/spec/features/merge_requests/diff_notes_avatars_spec.rb b/spec/features/merge_requests/diff_notes_avatars_spec.rb
index 166e98238e8..ce82c5cd1dc 100644
--- a/spec/features/merge_requests/diff_notes_avatars_spec.rb
+++ b/spec/features/merge_requests/diff_notes_avatars_spec.rb
@@ -22,7 +22,7 @@ feature 'Diff note avatars', js: true do
     project.team << [user, :master]
     sign_in user
 
-    allow_any_instance_of(ApplicationHelper).to receive(:collapsed_sidebar?).and_return(true)
+    page.driver.set_cookie('sidebar_collapsed', 'true')
   end
 
   context 'discussion tab' do
@@ -139,7 +139,7 @@ feature 'Diff note avatars', js: true do
         end
 
         page.within find("[id='#{position.line_code(project.repository)}']") do
-          find('.diff-notes-collapse').click
+          find('.diff-notes-collapse').trigger('click')
 
           expect(page).to have_selector('img.js-diff-comment-avatar', count: 2)
         end
diff --git a/spec/features/merge_requests/diff_notes_resolve_spec.rb b/spec/features/merge_requests/diff_notes_resolve_spec.rb
index 5019ed43496..27115bf8d14 100644
--- a/spec/features/merge_requests/diff_notes_resolve_spec.rb
+++ b/spec/features/merge_requests/diff_notes_resolve_spec.rb
@@ -196,10 +196,11 @@ feature 'Diff notes resolve', js: true do
       end
 
       it 'does not mark discussion as resolved when resolving single note' do
-        page.first '.diff-content .note' do
+        page.within("#note_#{note.id}") do
           first('.line-resolve-btn').click
 
-          expect(page).to have_selector('.note-action-button .loading')
+          wait_for_requests
+
           expect(first('.line-resolve-btn')['data-original-title']).to eq("Resolved by #{user.name}")
         end
 
diff --git a/spec/features/merge_requests/form_spec.rb b/spec/features/merge_requests/form_spec.rb
index 75988cfceae..aefb22a843e 100644
--- a/spec/features/merge_requests/form_spec.rb
+++ b/spec/features/merge_requests/form_spec.rb
@@ -84,13 +84,10 @@ describe 'New/edit merge request', :js do
           end
         end
 
-        page.within '.issuable-meta' do
+        page.within '.breadcrumbs' do
           merge_request = MergeRequest.find_by(source_branch: 'fix')
 
-          expect(page).to have_text("Merge request #{merge_request.to_reference}")
-          # compare paths because the host differ in test
-          expect(find_link(merge_request.to_reference)[:href])
-            .to end_with(merge_request_path(merge_request))
+          expect(page).to have_text("Merge Requests #{merge_request.to_reference}")
         end
       end
 
diff --git a/spec/features/merge_requests/resolve_outdated_diff_discussions.rb b/spec/features/merge_requests/resolve_outdated_diff_discussions.rb
new file mode 100644
index 00000000000..55a82bdf2b9
--- /dev/null
+++ b/spec/features/merge_requests/resolve_outdated_diff_discussions.rb
@@ -0,0 +1,78 @@
+require 'spec_helper'
+
+feature 'Resolve outdated diff discussions', js: true do
+  let(:project) { create(:project, :repository, :public) }
+
+  let(:merge_request) do
+    create(:merge_request, source_project: project, source_branch: 'csv', target_branch: 'master')
+  end
+
+  let(:outdated_diff_refs) { project.commit('926c6595b263b2a40da6b17f3e3b7ea08344fad6').diff_refs }
+  let(:current_diff_refs) { merge_request.diff_refs }
+
+  let(:outdated_position) do
+    Gitlab::Diff::Position.new(
+      old_path: 'files/csv/Book1.csv',
+      new_path: 'files/csv/Book1.csv',
+      old_line: nil,
+      new_line: 9,
+      diff_refs: outdated_diff_refs
+    )
+  end
+
+  let(:current_position) do
+    Gitlab::Diff::Position.new(
+      old_path: 'files/csv/Book1.csv',
+      new_path: 'files/csv/Book1.csv',
+      old_line: nil,
+      new_line: 1,
+      diff_refs: current_diff_refs
+    )
+  end
+
+  let!(:outdated_discussion) do
+    create(:diff_note_on_merge_request,
+           project: project,
+           noteable: merge_request,
+           position: outdated_position).to_discussion
+  end
+
+  let!(:current_discussion) do
+    create(:diff_note_on_merge_request,
+           noteable: merge_request,
+           project: project,
+           position: current_position).to_discussion
+  end
+
+  before do
+    sign_in(merge_request.author)
+  end
+
+  context 'when a discussion was resolved by a push' do
+    before do
+      project.update!(resolve_outdated_diff_discussions: true)
+
+      merge_request.update_diff_discussion_positions(
+        old_diff_refs: outdated_diff_refs,
+        new_diff_refs: current_diff_refs,
+        current_user: merge_request.author
+      )
+
+      visit project_merge_request_path(project, merge_request)
+    end
+
+    it 'shows that as automatically resolved' do
+      within(".discussion[data-discussion-id='#{outdated_discussion.id}']") do
+        expect(page).to have_css('.discussion-body', visible: false)
+        expect(page).to have_content('Automatically resolved')
+      end
+    end
+
+    it 'does not show that for active discussions' do
+      within(".discussion[data-discussion-id='#{current_discussion.id}']") do
+        expect(page).to have_css('.discussion-body', visible: true)
+        expect(page).not_to have_content('Automatically resolved')
+      end
+    end
+  end
+end
diff --git a/spec/features/merge_requests/user_posts_diff_notes_spec.rb b/spec/features/merge_requests/user_posts_diff_notes_spec.rb
index 996f9636491..c298f1927f1 100644
--- a/spec/features/merge_requests/user_posts_diff_notes_spec.rb
+++ b/spec/features/merge_requests/user_posts_diff_notes_spec.rb
@@ -6,7 +6,7 @@ feature 'Merge requests > User posts diff notes', :js do
   let(:project) { merge_request.source_project }
 
   before do
-    allow_any_instance_of(ApplicationHelper).to receive(:collapsed_sidebar?).and_return(true)
+    page.driver.set_cookie('sidebar_collapsed', 'true')
 
     project.add_developer(user)
     sign_in(user)
diff --git a/spec/features/profiles/user_manages_emails_spec.rb b/spec/features/profiles/user_manages_emails_spec.rb
new file mode 100644
index 00000000000..7283c76eb54
--- /dev/null
+++ b/spec/features/profiles/user_manages_emails_spec.rb
@@ -0,0 +1,78 @@
+require 'spec_helper'
+
+describe 'User manages emails' do
+  let(:user) { create(:user) }
+
+  before do
+    sign_in(user)
+
+    visit(profile_emails_path)
+  end
+
+  it "shows user's emails" do
+    expect(page).to have_content(user.email)
+
+    user.emails.each do |email|
+      expect(page).to have_content(email.email)
+    end
+  end
+
+  it 'adds an email' do
+    fill_in('email_email', with: 'my@email.com')
+    click_button('Add')
+
+    email = user.emails.find_by(email: 'my@email.com')
+
+    expect(email).not_to be_nil
+    expect(page).to have_content('my@email.com')
+    expect(page).to have_content(user.email)
+
+    user.emails.each do |email|
+      expect(page).to have_content(email.email)
+    end
+  end
+
+  it 'does not add a duplicate email' do
+    fill_in('email_email', with: user.email)
+    click_button('Add')
+
+    email = user.emails.find_by(email: user.email)
+
+    expect(email).to be_nil
+    expect(page).to have_content(user.email)
+
+    user.emails.each do |email|
+      expect(page).to have_content(email.email)
+    end
+  end
+
+  it 'removes an email' do
+    fill_in('email_email', with: 'my@email.com')
+    click_button('Add')
+
+    email = user.emails.find_by(email: 'my@email.com')
+
+    expect(email).not_to be_nil
+    expect(page).to have_content('my@email.com')
+    expect(page).to have_content(user.email)
+
+    user.emails.each do |email|
+      expect(page).to have_content(email.email)
+    end
+
+    # There should be only one remove button at this time
+    click_link('Remove')
+
+    # Force these to reload as they have been cached
+    user.emails.reload
+    email = user.emails.find_by(email: 'my@email.com')
+
+    expect(email).to be_nil
+    expect(page).not_to have_content('my@email.com')
+    expect(page).to have_content(user.email)
+
+    user.emails.each do |email|
+      expect(page).to have_content(email.email)
+    end
+  end
+end
diff --git a/spec/features/profiles/user_visits_profile_account_page_spec.rb b/spec/features/profiles/user_visits_profile_account_page_spec.rb
new file mode 100644
index 00000000000..8c7233c77ad
--- /dev/null
+++ b/spec/features/profiles/user_visits_profile_account_page_spec.rb
@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe 'User visits the profile account page' do
+  let(:user) { create(:user) }
+
+  before do
+    sign_in(user)
+
+    visit(profile_account_path)
+  end
+
+  it 'shows correct menu item' do
+    expect(find('.sidebar-top-level-items > li.active')).to have_content('Account')
+    expect(page).to have_selector('.sidebar-top-level-items > li.active', count: 1)
+  end
+end
diff --git a/spec/features/profiles/user_visits_profile_authentication_log_page_spec.rb b/spec/features/profiles/user_visits_profile_authentication_log_page_spec.rb
new file mode 100644
index 00000000000..ffb504cc573
--- /dev/null
+++ b/spec/features/profiles/user_visits_profile_authentication_log_page_spec.rb
@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe 'User visits the authentication log page' do
+  let(:user) { create(:user) }
+
+  before do
+    sign_in(user)
+
+    visit(audit_log_profile_path)
+  end
+
+  it 'shows correct menu item' do
+    expect(find('.sidebar-top-level-items > li.active')).to have_content('Authentication log')
+    expect(page).to have_selector('.sidebar-top-level-items > li.active', count: 1)
+  end
+end
diff --git a/spec/features/profiles/user_visits_profile_page_spec.rb b/spec/features/profiles/user_visits_profile_page_spec.rb
new file mode 100644
index 00000000000..3bf6d718bc7
--- /dev/null
+++ b/spec/features/profiles/user_visits_profile_page_spec.rb
@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe 'User visits the profile page' do
+  let(:user) { create(:user) }
+
+  before do
+    sign_in(user)
+
+    visit(profile_path)
+  end
+
+  it 'shows correct menu item' do
+    expect(find('.sidebar-top-level-items > li.active')).to have_content('Profile')
+    expect(page).to have_selector('.sidebar-top-level-items > li.active', count: 1)
+  end
+end
diff --git a/spec/features/profiles/preferences_spec.rb b/spec/features/profiles/user_visits_profile_preferences_page_spec.rb
index 091fb3a356c..fbc18d30e32 100644
--- a/spec/features/profiles/preferences_spec.rb
+++ b/spec/features/profiles/user_visits_profile_preferences_page_spec.rb
@@ -1,14 +1,20 @@
 require 'spec_helper'
 
-describe 'Profile > Preferences', :js do
+describe 'User visits the profile preferences page' do
   let(:user) { create(:user) }
 
   before do
     sign_in(user)
-    visit profile_preferences_path
+
+    visit(profile_preferences_path)
+  end
+
+  it 'shows correct menu item' do
+    expect(find('.sidebar-top-level-items > li.active')).to have_content('Preferences')
+    expect(page).to have_selector('.sidebar-top-level-items > li.active', count: 1)
   end
 
-  describe 'User changes their syntax highlighting theme' do
+  describe 'User changes their syntax highlighting theme', :js do
     it 'creates a flash message' do
       choose 'user_color_scheme_id_5'
 
@@ -27,7 +33,7 @@ describe 'Profile > Preferences', :js do
     end
   end
 
-  describe 'User changes their default dashboard' do
+  describe 'User changes their default dashboard', :js do
     it 'creates a flash message' do
       select 'Starred Projects', from: 'user_dashboard'
       click_button 'Save'
diff --git a/spec/features/profiles/user_visits_profile_ssh_keys_page_spec.rb b/spec/features/profiles/user_visits_profile_ssh_keys_page_spec.rb
new file mode 100644
index 00000000000..0b7a63b54b4
--- /dev/null
+++ b/spec/features/profiles/user_visits_profile_ssh_keys_page_spec.rb
@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe 'User visits the profile SSH keys page' do
+  let(:user) { create(:user) }
+
+  before do
+    sign_in(user)
+
+    visit(profile_keys_path)
+  end
+
+  it 'shows correct menu item' do
+    expect(find('.sidebar-top-level-items > li.active')).to have_content('SSH Keys')
+    expect(page).to have_selector('.sidebar-top-level-items > li.active', count: 1)
+  end
+end
diff --git a/spec/features/projects/awards/user_interacts_with_awards_in_issue_spec.rb b/spec/features/projects/awards/user_interacts_with_awards_in_issue_spec.rb
new file mode 100644
index 00000000000..adff0a10f0e
--- /dev/null
+++ b/spec/features/projects/awards/user_interacts_with_awards_in_issue_spec.rb
@@ -0,0 +1,104 @@
+require 'spec_helper'
+
+describe 'User interacts with awards in an issue', :js do
+  let(:issue) { create(:issue, project: project)}
+  let(:project) { create(:project) }
+  let(:user) { create(:user) }
+
+  before do
+    project.add_master(user)
+    sign_in(user)
+
+    visit(project_issue_path(project, issue))
+  end
+
+  it 'toggles the thumbsup award emoji' do
+    page.within('.awards') do
+      thumbsup = page.first('.award-control')
+      thumbsup.click
+      thumbsup.hover
+
+      expect(page).to have_selector('.js-emoji-btn')
+      expect(page).to have_css(".js-emoji-btn.active[data-original-title='You']")
+      expect(page.find('.js-emoji-btn.active .js-counter')).to have_content('1')
+
+      thumbsup = page.first('.award-control')
+      thumbsup.click
+      thumbsup.hover
+
+      expect(page).to have_selector('.award-control.js-emoji-btn')
+      expect(page.all('.award-control.js-emoji-btn').size).to eq(2)
+
+      page.all('.award-control.js-emoji-btn').each do |element|
+        expect(element['title']).to eq('')
+      end
+
+      page.all('.award-control .js-counter').each do |element|
+        expect(element).to have_content('0')
+      end
+
+      thumbsup = page.first('.award-control')
+      thumbsup.click
+      thumbsup.hover
+
+      expect(page).to have_selector('.js-emoji-btn')
+      expect(page).to have_css(".js-emoji-btn.active[data-original-title='You']")
+      expect(page.find('.js-emoji-btn.active .js-counter')).to have_content('1')
+    end
+  end
+
+  it 'toggles a custom award emoji' do
+    page.within('.awards') do
+      page.find('.js-add-award').click
+    end
+
+    page.find('.emoji-menu.is-visible')
+
+    expect(page).to have_selector('.js-emoji-menu-search')
+    expect(page.evaluate_script("document.activeElement.classList.contains('js-emoji-menu-search')")).to eq(true)
+
+    page.within('.emoji-menu-content') do
+      emoji_button = page.first('.js-emoji-btn')
+      emoji_button.hover
+      emoji_button.click
+    end
+
+    page.within('.awards') do
+      expect(page).to have_selector('.js-emoji-btn')
+      expect(page.find('.js-emoji-btn.active .js-counter')).to have_content('1')
+      expect(page).to have_css(".js-emoji-btn.active[data-original-title='You']")
+
+      expect do
+        page.find('.js-emoji-btn.active').click
+        wait_for_requests
+      end.to change { page.all('.award-control.js-emoji-btn').size }.from(3).to(2)
+    end
+  end
+
+  it 'shows the list of award emoji categories' do
+    page.within('.awards') do
+      page.find('.js-add-award').click
+    end
+
+    page.find('.emoji-menu.is-visible')
+
+    expect(page).to have_selector('.js-emoji-menu-search')
+    expect(page.evaluate_script("document.activeElement.classList.contains('js-emoji-menu-search')")).to eq(true)
+
+    fill_in('emoji-menu-search', with: 'hand')
+
+    page.within('.emoji-menu-content') do
+      expect(page).to have_selector('[data-name="raised_hand"]')
+    end
+  end
+
+  it 'adds an award emoji by a comment' do
+    page.within('.js-main-target-form') do
+      fill_in('note[note]', with: ':smile:')
+
+      click_button('Comment')
+    end
+
+    expect(page).to have_selector('gl-emoji[data-name="smile"]')
+  end
+end
diff --git a/spec/features/projects/edit_spec.rb b/spec/features/projects/edit_spec.rb
index d3b1d1f7be3..17f914c9c17 100644
--- a/spec/features/projects/edit_spec.rb
+++ b/spec/features/projects/edit_spec.rb
@@ -1,20 +1,21 @@
 require 'rails_helper'
 
 feature 'Project edit', js: true do
+  let(:admin)   { create(:admin) }
   let(:user)    { create(:user) }
   let(:project) { create(:project) }
 
-  before do
-    project.team << [user, :master]
-    sign_in(user)
+  context 'feature visibility' do
+    before do
+      project.team << [user, :master]
+      sign_in(user)
 
-    visit edit_project_path(project)
-  end
+      visit edit_project_path(project)
+    end
 
-  context 'feature visibility' do
     context 'merge requests select' do
       it 'hides merge requests section' do
-        select('Disabled', from: 'project_project_feature_attributes_merge_requests_access_level')
+        find('.project-feature-controls[data-for="project[project_feature_attributes][merge_requests_access_level]"] .project-feature-toggle').click
 
         expect(page).to have_selector('.merge-requests-feature', visible: false)
       end
@@ -30,7 +31,7 @@ feature 'Project edit', js: true do
 
     context 'builds select' do
       it 'hides builds select section' do
-        select('Disabled', from: 'project_project_feature_attributes_builds_access_level')
+        find('.project-feature-controls[data-for="project[project_feature_attributes][builds_access_level]"] .project-feature-toggle').click
 
         expect(page).to have_selector('.builds-feature', visible: false)
       end
@@ -44,4 +45,18 @@ feature 'Project edit', js: true do
       end
     end
   end
+
+  context 'LFS enabled setting' do
+    before do
+      sign_in(admin)
+    end
+
+    it 'displays the correct elements' do
+      allow(Gitlab.config.lfs).to receive(:enabled).and_return(true)
+      visit edit_project_path(project)
+
+      expect(page).to have_content('Git Large File Storage')
+      expect(page).to have_selector('input[name="project[lfs_enabled]"] + button', visible: true)
+    end
+  end
 end
diff --git a/spec/features/projects/environments/environments_spec.rb b/spec/features/projects/environments/environments_spec.rb
index bb943b6bc45..0132ea95777 100644
--- a/spec/features/projects/environments/environments_spec.rb
+++ b/spec/features/projects/environments/environments_spec.rb
@@ -10,26 +10,23 @@ feature 'Environments page', :js do
     sign_in(user)
   end
 
-  given!(:environment) { }
-  given!(:deployment) { }
-  given!(:action) { }
-
-  before do
-    visit_environments(project)
-  end
-
   describe 'page tabs' do
-    scenario 'shows "Available" and "Stopped" tab with links' do
+    it 'shows "Available" and "Stopped" tab with links' do
+      visit_environments(project)
+
       expect(page).to have_link('Available')
       expect(page).to have_link('Stopped')
     end
 
     describe 'with one available environment' do
-      given(:environment) { create(:environment, project: project, state: :available) }
+      before do
+        create(:environment, project: project, state: :available)
+      end
 
       describe 'in available tab page' do
         it 'should show one environment' do
-          visit project_environments_path(project, scope: 'available')
+          visit_environments(project, scope: 'available')
+
           expect(page).to have_css('.environments-container')
           expect(page.all('.environment-name').length).to eq(1)
         end
@@ -37,7 +34,8 @@ feature 'Environments page', :js do
 
       describe 'in stopped tab page' do
         it 'should show no environments' do
-          visit project_environments_path(project, scope: 'stopped')
+          visit_environments(project, scope: 'stopped')
+
           expect(page).to have_css('.environments-container')
           expect(page).to have_content('You don\'t have any environments right now')
         end
@@ -45,11 +43,14 @@ feature 'Environments page', :js do
     end
 
     describe 'with one stopped environment' do
-      given(:environment) { create(:environment, project: project, state: :stopped) }
+      before do
+        create(:environment, project: project, state: :stopped)
+      end
 
       describe 'in available tab page' do
         it 'should show no environments' do
-          visit project_environments_path(project, scope: 'available')
+          visit_environments(project, scope: 'available')
+
           expect(page).to have_css('.environments-container')
           expect(page).to have_content('You don\'t have any environments right now')
         end
@@ -57,7 +58,8 @@ feature 'Environments page', :js do
 
       describe 'in stopped tab page' do
         it 'should show one environment' do
-          visit project_environments_path(project, scope: 'stopped')
+          visit_environments(project, scope: 'stopped')
+
           expect(page).to have_css('.environments-container')
           expect(page.all('.environment-name').length).to eq(1)
         end
@@ -66,86 +68,84 @@ feature 'Environments page', :js do
   end
 
   context 'without environments' do
-    scenario 'does show no environments' do
-      expect(page).to have_content('You don\'t have any environments right now.')
+    before do
+      visit_environments(project)
     end
 
-    scenario 'does show 0 as counter for environments in both tabs' do
+    it 'does not show environments and counters are set to zero' do
+      expect(page).to have_content('You don\'t have any environments right now.')
+
       expect(page.find('.js-available-environments-count').text).to eq('0')
       expect(page.find('.js-stopped-environments-count').text).to eq('0')
     end
   end
 
-  describe 'when showing the environment' do
-    given(:environment) { create(:environment, project: project) }
-
-    scenario 'does show environment name' do
-      expect(page).to have_link(environment.name)
-    end
-
-    scenario 'does show number of available and stopped environments' do
-      expect(page.find('.js-available-environments-count').text).to eq('1')
-      expect(page.find('.js-stopped-environments-count').text).to eq('0')
+  describe 'environments table' do
+    given!(:environment) do
+      create(:environment, project: project, state: :available)
     end
 
-    context 'without deployments' do
-      scenario 'does show no deployments' do
-        expect(page).to have_content('No deployments yet')
+    context 'when there are no deployments' do
+      before do
+        visit_environments(project)
       end
 
-      context 'for available environment' do
-        given(:environment) { create(:environment, project: project, state: :available) }
+      it 'shows environments names and counters' do
+        expect(page).to have_link(environment.name)
 
-        scenario 'does not shows stop button' do
-          expect(page).not_to have_selector('.stop-env-link')
-        end
+        expect(page.find('.js-available-environments-count').text).to eq('1')
+        expect(page.find('.js-stopped-environments-count').text).to eq('0')
       end
 
-      context 'for stopped environment' do
-        given(:environment) { create(:environment, project: project, state: :stopped) }
+      it 'does not show deployments' do
+        expect(page).to have_content('No deployments yet')
+      end
 
-        scenario 'does not shows stop button' do
-          expect(page).not_to have_selector('.stop-env-link')
-        end
+      it 'does not show stip button when environment is not stoppable' do
+        expect(page).not_to have_selector('.stop-env-link')
       end
     end
 
-    context 'with deployments' do
+    context 'when there are deployments' do
       given(:project) { create(:project, :repository) }
 
-      given(:deployment) do
+      given!(:deployment) do
         create(:deployment, environment: environment,
                             sha: project.commit.id)
       end
 
-      scenario 'does show deployment SHA' do
-        expect(page).to have_link(deployment.short_sha)
-      end
+      it 'shows deployment SHA and internal ID' do
+        visit_environments(project)
 
-      scenario 'does show deployment internal id' do
+        expect(page).to have_link(deployment.short_sha)
         expect(page).to have_content(deployment.iid)
       end
 
-      context 'with build and manual actions' do
-        given(:pipeline) { create(:ci_pipeline, project: project) }
-        given(:build) { create(:ci_build, pipeline: pipeline) }
+      context 'when builds and manual actions are present' do
+        given!(:pipeline) { create(:ci_pipeline, project: project) }
+        given!(:build) { create(:ci_build, pipeline: pipeline) }
 
-        given(:action) do
+        given!(:action) do
           create(:ci_build, :manual, pipeline: pipeline, name: 'deploy to production')
         end
 
-        given(:deployment) do
+        given!(:deployment) do
           create(:deployment, environment: environment,
                               deployable: build,
                               sha: project.commit.id)
         end
 
-        scenario 'does show a play button' do
+        before do
+          visit_environments(project)
+        end
+
+        it 'shows a play button' do
           find('.js-dropdown-play-icon-container').click
+
           expect(page).to have_content(action.name.humanize)
         end
 
-        scenario 'does allow to play manual action', js: true do
+        it 'allows to play a manual action', js: true do
           expect(action).to be_manual
 
           find('.js-dropdown-play-icon-container').click
@@ -155,19 +155,19 @@ feature 'Environments page', :js do
             .not_to change { Ci::Pipeline.count }
         end
 
-        scenario 'does show build name and id' do
+        it 'shows build name and id' do
           expect(page).to have_link("#{build.name} ##{build.id}")
         end
 
-        scenario 'does not show stop button' do
+        it 'shows a stop button' do
           expect(page).not_to have_selector('.stop-env-link')
         end
 
-        scenario 'does not show external link button' do
+        it 'does not show external link button' do
           expect(page).not_to have_css('external-url')
         end
 
-        scenario 'does not show terminal button' do
+        it 'does not show terminal button' do
           expect(page).not_to have_terminal_button
         end
 
@@ -176,7 +176,7 @@ feature 'Environments page', :js do
           given(:build) { create(:ci_build, pipeline: pipeline) }
           given(:deployment) { create(:deployment, environment: environment, deployable: build) }
 
-          scenario 'does show an external link button' do
+          it 'shows an external link button' do
             expect(page).to have_link(nil, href: environment.external_url)
           end
         end
@@ -192,34 +192,34 @@ feature 'Environments page', :js do
                                 on_stop: 'close_app')
           end
 
-          scenario 'does show stop button' do
+          it 'shows a stop button' do
             expect(page).to have_selector('.stop-env-link')
           end
 
-          context 'for reporter' do
+          context 'when user is a reporter' do
             let(:role) { :reporter }
 
-            scenario 'does not show stop button' do
+            it 'does not show stop button' do
               expect(page).not_to have_selector('.stop-env-link')
             end
           end
         end
 
-        context 'with terminal' do
+        context 'when kubernetes terminal is available' do
           let(:project) { create(:kubernetes_project, :test_repo) }
 
           context 'for project master' do
             let(:role) { :master }
 
-            scenario 'it shows the terminal button' do
+            it 'shows the terminal button' do
               expect(page).to have_terminal_button
             end
           end
 
-          context 'for developer' do
+          context 'when user is a developer' do
             let(:role) { :developer }
 
-            scenario 'does not show terminal button' do
+            it 'does not show terminal button' do
               expect(page).not_to have_terminal_button
             end
           end
@@ -228,59 +228,77 @@ feature 'Environments page', :js do
     end
   end
 
-  scenario 'does have a New environment button' do
+  it 'does have a new environment button' do
+    visit_environments(project)
+
     expect(page).to have_link('New environment')
   end
 
-  describe 'when creating a new environment' do
+  describe 'creating a new environment' do
     before do
       visit_environments(project)
     end
 
-    context 'when logged as developer' do
-      before do
-        within(".top-area") do
-          click_link 'New environment'
-        end
-      end
+    context 'user is a developer' do
+      given(:role) { :developer }
 
-      context 'for valid name' do
-        before do
-          fill_in('Name', with: 'production')
-          click_on 'Save'
-        end
+      scenario 'developer creates a new environment with a valid name' do
+        within(".top-area") { click_link 'New environment' }
+        fill_in('Name', with: 'production')
+        click_on 'Save'
 
-        scenario 'does create a new pipeline' do
-          expect(page).to have_content('production')
-        end
+        expect(page).to have_content('production')
       end
 
-      context 'for invalid name' do
-        before do
-          fill_in('Name', with: 'name,with,commas')
-          click_on 'Save'
-        end
+      scenario 'developer creates a new environmetn with invalid name' do
+        within(".top-area") { click_link 'New environment' }
+        fill_in('Name', with: 'name,with,commas')
+        click_on 'Save'
 
-        scenario 'does show errors' do
-          expect(page).to have_content('Name can contain only letters')
-        end
+        expect(page).to have_content('Name can contain only letters')
       end
     end
 
-    context 'when logged as reporter' do
+    context 'user is a reporter' do
       given(:role) { :reporter }
 
-      scenario 'does not have a New environment link' do
+      scenario 'reporters tries to create a new environment' do
         expect(page).not_to have_link('New environment')
       end
     end
   end
 
+  describe 'environments folders' do
+    before do
+      create(:environment, project: project,
+                           name: 'staging/review-1',
+                           state: :available)
+      create(:environment, project: project,
+                           name: 'staging/review-2',
+                           state: :available)
+    end
+
+    scenario 'users unfurls an environment folder' do
+      visit_environments(project)
+
+      expect(page).not_to have_content 'review-1'
+      expect(page).not_to have_content 'review-2'
+      expect(page).to have_content 'staging 2'
+
+      within('.folder-row') do
+        find('.folder-name', text: 'staging').click
+      end
+
+      expect(page).to have_content 'review-1'
+      expect(page).to have_content 'review-2'
+    end
+  end
+
   def have_terminal_button
     have_link(nil, href: terminal_project_environment_path(project, environment))
   end
 
-  def visit_environments(project)
-    visit project_environments_path(project)
+  def visit_environments(project, **opts)
+    visit project_environments_path(project, **opts)
   end
 end
diff --git a/spec/features/projects/features_visibility_spec.rb b/spec/features/projects/features_visibility_spec.rb
index 24691629063..57722276d79 100644
--- a/spec/features/projects/features_visibility_spec.rb
+++ b/spec/features/projects/features_visibility_spec.rb
@@ -19,21 +19,16 @@ describe 'Edit Project Settings' do
         it 'toggles visibility' do
           visit edit_project_path(project)
 
-          select 'Disabled', from: "project_project_feature_attributes_#{tool_name}_access_level"
+          # disable by clicking toggle
+          toggle_feature_off("project[project_feature_attributes][#{tool_name}_access_level]")
           page.within('.sharing-permissions') do
             click_button 'Save changes'
           end
           wait_for_requests
           expect(page).not_to have_selector(".shortcuts-#{shortcut_name}")
 
-          select 'Everyone with access', from: "project_project_feature_attributes_#{tool_name}_access_level"
-          page.within('.sharing-permissions') do
-            click_button 'Save changes'
-          end
-          wait_for_requests
-          expect(page).to have_selector(".shortcuts-#{shortcut_name}")
-
-          select 'Only team members', from: "project_project_feature_attributes_#{tool_name}_access_level"
+          # re-enable by clicking toggle again
+          toggle_feature_on("project[project_feature_attributes][#{tool_name}_access_level]")
           page.within('.sharing-permissions') do
             click_button 'Save changes'
           end
@@ -176,19 +171,19 @@ describe 'Edit Project Settings' do
     end
 
     it "disables repository related features" do
-      select "Disabled", from: "project_project_feature_attributes_repository_access_level"
+      toggle_feature_off('project[project_feature_attributes][repository_access_level]')
 
       page.within('.sharing-permissions') do
         click_button "Save changes"
       end
 
-      expect(find(".sharing-permissions")).to have_selector("select.disabled", count: 2)
+      expect(find(".sharing-permissions")).to have_selector(".project-feature-toggle.disabled", count: 2)
     end
 
     it "shows empty features project homepage" do
-      select "Disabled", from: "project_project_feature_attributes_repository_access_level"
-      select "Disabled", from: "project_project_feature_attributes_issues_access_level"
-      select "Disabled", from: "project_project_feature_attributes_wiki_access_level"
+      toggle_feature_off('project[project_feature_attributes][repository_access_level]')
+      toggle_feature_off('project[project_feature_attributes][issues_access_level]')
+      toggle_feature_off('project[project_feature_attributes][wiki_access_level]')
 
       page.within('.sharing-permissions') do
         click_button "Save changes"
@@ -201,9 +196,9 @@ describe 'Edit Project Settings' do
     end
 
     it "hides project activity tabs" do
-      select "Disabled", from: "project_project_feature_attributes_repository_access_level"
-      select "Disabled", from: "project_project_feature_attributes_issues_access_level"
-      select "Disabled", from: "project_project_feature_attributes_wiki_access_level"
+      toggle_feature_off('project[project_feature_attributes][repository_access_level]')
+      toggle_feature_off('project[project_feature_attributes][issues_access_level]')
+      toggle_feature_off('project[project_feature_attributes][wiki_access_level]')
 
       page.within('.sharing-permissions') do
         click_button "Save changes"
@@ -222,7 +217,7 @@ describe 'Edit Project Settings' do
 
     # Regression spec for https://gitlab.com/gitlab-org/gitlab-ce/issues/25272
     it "hides comments activity tab only on disabled issues, merge requests and repository" do
-      select "Disabled", from: "project_project_feature_attributes_issues_access_level"
+      toggle_feature_off('project[project_feature_attributes][issues_access_level]')
 
       save_changes_and_check_activity_tab do
         expect(page).to have_content("Comments")
@@ -230,7 +225,7 @@ describe 'Edit Project Settings' do
 
       visit edit_project_path(project)
 
-      select "Disabled", from: "project_project_feature_attributes_merge_requests_access_level"
+      toggle_feature_off('project[project_feature_attributes][merge_requests_access_level]')
 
       save_changes_and_check_activity_tab do
         expect(page).to have_content("Comments")
@@ -238,7 +233,7 @@ describe 'Edit Project Settings' do
 
       visit edit_project_path(project)
 
-      select "Disabled", from: "project_project_feature_attributes_repository_access_level"
+      toggle_feature_off('project[project_feature_attributes][repository_access_level]')
 
       save_changes_and_check_activity_tab do
         expect(page).not_to have_content("Comments")
@@ -275,4 +270,12 @@ describe 'Edit Project Settings' do
       expect(page).not_to have_selector('.project-stats')
     end
   end
+
+  def toggle_feature_off(feature_name)
+    find(".project-feature-controls[data-for=\"#{feature_name}\"] .project-feature-toggle.checked").click
+  end
+
+  def toggle_feature_on(feature_name)
+    find(".project-feature-controls[data-for=\"#{feature_name}\"] .project-feature-toggle:not(.checked)").click
+  end
 end
diff --git a/spec/features/projects/files/creating_a_file_spec.rb b/spec/features/projects/files/creating_a_file_spec.rb
index e13bf4b6089..e1852a6e544 100644
--- a/spec/features/projects/files/creating_a_file_spec.rb
+++ b/spec/features/projects/files/creating_a_file_spec.rb
@@ -14,7 +14,7 @@ feature 'User wants to create a file' do
     file_name = find('#file_name')
     file_name.set options[:file_name] || 'README.md'
 
-    file_content = find('#file-content')
+    file_content = find('#file-content', visible: false)
     file_content.set options[:file_content] || 'Some content'
 
     click_button 'Commit changes'
diff --git a/spec/features/projects/group_links_spec.rb b/spec/features/projects/group_links_spec.rb
deleted file mode 100644
index d468216d28b..00000000000
--- a/spec/features/projects/group_links_spec.rb
+++ /dev/null
@@ -1,77 +0,0 @@
-require 'spec_helper'
-
-feature 'Project group links', :js do
-  include Select2Helper
-
-  let(:master) { create(:user) }
-  let(:project) { create(:project) }
-  let!(:group) { create(:group) }
-
-  background do
-    project.add_master(master)
-    sign_in(master)
-  end
-
-  context 'setting an expiration date for a group link' do
-    before do
-      visit project_settings_members_path(project)
-
-      click_on 'share-with-group-tab'
-
-      select2 group.id, from: '#link_group_id'
-      fill_in 'expires_at_groups', with: (Time.current + 4.5.days).strftime('%Y-%m-%d')
-      page.find('body').click
-      find('.btn-create').click
-    end
-
-    it 'shows the expiration time with a warning class' do
-      page.within('.project-members-groups') do
-        expect(page).to have_content('Expires in 4 days')
-        expect(page).to have_selector('.text-warning')
-      end
-    end
-  end
-
-  context 'nested group project' do
-    let!(:nested_group) { create(:group, parent: group) }
-    let!(:another_group) { create(:group) }
-    let!(:project) { create(:project, namespace: nested_group) }
-
-    background do
-      group.add_master(master)
-      another_group.add_master(master)
-    end
-
-    it 'does not show ancestors', :nested_groups do
-      visit project_settings_members_path(project)
-
-      click_on 'share-with-group-tab'
-      click_link 'Search for a group'
-
-      page.within '.select2-drop' do
-        expect(page).to have_content(another_group.name)
-        expect(page).not_to have_content(group.name)
-      end
-    end
-  end
-
-  describe 'the groups dropdown' do
-    before do
-      group_two = create(:group)
-      group.add_owner(master)
-      group_two.add_owner(master)
-
-      visit project_settings_members_path(project)
-      execute_script 'GroupsSelect.PER_PAGE = 1;'
-      open_select2 '#link_group_id'
-    end
-
-    it 'should infinitely scroll' do
-      expect(find('.select2-drop .select2-results')).to have_selector('.select2-result', count: 1)
-
-      scroll_select2_to_bottom('.select2-drop .select2-results:visible')
-
-      expect(find('.select2-drop .select2-results')).to have_selector('.select2-result', count: 2)
-    end
-  end
-end
diff --git a/spec/features/projects/import_export/import_file_spec.rb b/spec/features/projects/import_export/import_file_spec.rb
index ad2db1a34f4..e5c7781a096 100644
--- a/spec/features/projects/import_export/import_file_spec.rb
+++ b/spec/features/projects/import_export/import_file_spec.rb
@@ -18,7 +18,7 @@ feature 'Import/Export - project import integration test', js: true do
 
   context 'when selecting the namespace' do
     let(:user) { create(:admin) }
-    let!(:namespace) { create(:namespace, name: 'asd', owner: user) }
+    let!(:namespace) { user.namespace }
     let(:project_path) { 'test-project-path' + SecureRandom.hex }
 
     context 'prefilled the path' do
@@ -66,12 +66,11 @@ feature 'Import/Export - project import integration test', js: true do
   end
 
   scenario 'invalid project' do
-    namespace = create(:namespace, name: 'asdf', owner: user)
-    project = create(:project, namespace: namespace)
+    project = create(:project, namespace: user.namespace)
 
     visit new_project_path
 
-    select2(namespace.id, from: '#project_namespace_id')
+    select2(user.namespace.id, from: '#project_namespace_id')
     fill_in :project_path, with: project.name, visible: true
     click_link 'GitLab export'
     attach_file('file', file)
diff --git a/spec/features/projects/import_export/test_project_export.tar.gz b/spec/features/projects/import_export/test_project_export.tar.gz
index e03e7b88174..9614c72cdc3 100644
--- a/spec/features/projects/import_export/test_project_export.tar.gz
+++ b/spec/features/projects/import_export/test_project_export.tar.gz
diff --git a/spec/features/projects/jobs/user_browses_job_spec.rb b/spec/features/projects/jobs/user_browses_job_spec.rb
new file mode 100644
index 00000000000..21c9acc7ac0
--- /dev/null
+++ b/spec/features/projects/jobs/user_browses_job_spec.rb
@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+describe 'User browses a job', :js do
+  let!(:build) { create(:ci_build, :coverage, pipeline: pipeline) }
+  let(:pipeline) { create(:ci_empty_pipeline, project: project, sha: project.commit.sha, ref: 'master') }
+  let(:project) { create(:project, :repository, namespace: user.namespace) }
+  let(:user) { create(:user) }
+
+  before do
+    project.add_master(user)
+    project.enable_ci
+    build.success
+    build.trace.set('job trace')
+
+    sign_in(user)
+
+    visit(project_job_path(project, build))
+  end
+
+  it 'erases the job log' do
+    expect(page).to have_content("Job ##{build.id}")
+    expect(page).to have_css('#build-trace')
+
+    click_link('Erase')
+
+    expect(build).not_to have_trace
+    expect(build.artifacts_file.exists?).to be_falsy
+    expect(build.artifacts_metadata.exists?).to be_falsy
+    expect(page).to have_no_css('.artifacts')
+
+    page.within('.erased') do
+      expect(page).to have_content('Job has been erased')
+    end
+
+    expect(build.project.running_or_pending_build_count).to eq(build.project.builds.running_or_pending.count(:all))
+  end
+end
diff --git a/spec/features/projects/jobs/user_browses_jobs_spec.rb b/spec/features/projects/jobs/user_browses_jobs_spec.rb
new file mode 100644
index 00000000000..767777f3bf9
--- /dev/null
+++ b/spec/features/projects/jobs/user_browses_jobs_spec.rb
@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe 'User browses jobs' do
+  let!(:build) { create(:ci_build, :coverage, pipeline: pipeline) }
+  let(:pipeline) { create(:ci_empty_pipeline, project: project, sha: project.commit.sha, ref: 'master') }
+  let(:project) { create(:project, :repository, namespace: user.namespace) }
+  let(:user) { create(:user) }
+
+  before do
+    project.add_master(user)
+    project.enable_ci
+    project.update_attribute(:build_coverage_regex, /Coverage (\d+)%/)
+
+    sign_in(user)
+
+    visit(project_jobs_path(project))
+  end
+
+  it 'shows the coverage' do
+    page.within('td.coverage') do
+      expect(page).to have_content('99.9%')
+    end
+  end
+
+  it 'shows the "CI Lint" button' do
+    page.within('.nav-controls') do
+      ci_lint_tool_link = page.find_link('CI lint')
+
+      expect(ci_lint_tool_link[:href]).to end_with(ci_lint_path)
+    end
+  end
+end
diff --git a/spec/features/projects/jobs_spec.rb b/spec/features/projects/jobs_spec.rb
index 9ed82f5a67f..4848159c1f7 100644
--- a/spec/features/projects/jobs_spec.rb
+++ b/spec/features/projects/jobs_spec.rb
@@ -164,9 +164,9 @@ feature 'Jobs' do
         end
 
         it 'links to issues/new with the title and description filled in' do
-          button_title = "Build Failed ##{job.id}"
-          job_path = project_job_path(project, job)
-          options = { issue: { title: button_title, description: job_path } }
+          button_title = "Job Failed ##{job.id}"
+          job_url = project_job_path(project, job)
+          options = { issue: { title: button_title, description: "Job [##{job.id}](#{job_url}) failed for #{job.sha}:\n" } }
 
           href = new_project_issue_path(project, options)
 
diff --git a/spec/features/projects/members/group_links_spec.rb b/spec/features/projects/members/groups_with_access_list_spec.rb
index 1c348b987d4..9950272af08 100644
--- a/spec/features/projects/members/group_links_spec.rb
+++ b/spec/features/projects/members/groups_with_access_list_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-feature 'Projects > Members > Anonymous user sees members', js: true do
+feature 'Projects > Members > Groups with access list', js: true do
   let(:user) { create(:user) }
   let(:group) { create(:group, :public) }
   let(:project) { create(:project, :public) }
@@ -13,7 +13,7 @@ feature 'Projects > Members > Anonymous user sees members', js: true do
     visit project_settings_members_path(project)
   end
 
-  it 'updates group access level' do
+  scenario 'updates group access level' do
     click_button @group_link.human_access
 
     page.within '.dropdown-menu' do
@@ -27,7 +27,7 @@ feature 'Projects > Members > Anonymous user sees members', js: true do
     expect(first('.group_member')).to have_content('Guest')
   end
 
-  it 'updates expiry date' do
+  scenario 'updates expiry date' do
     tomorrow = Date.today + 3
 
     fill_in "member_expires_at_#{group.id}", with: tomorrow.strftime("%F")
@@ -38,7 +38,7 @@ feature 'Projects > Members > Anonymous user sees members', js: true do
     end
   end
 
-  it 'deletes group link' do
+  scenario 'deletes group link' do
     page.within(first('.group_member')) do
       find('.btn-remove').click
     end
@@ -47,8 +47,8 @@ feature 'Projects > Members > Anonymous user sees members', js: true do
     expect(page).not_to have_selector('.group_member')
   end
 
-  context 'search' do
-    it 'finds no results' do
+  context 'search in existing members (yes, this filters the groups list as well)' do
+    scenario 'finds no results' do
       page.within '.member-search-form' do
         fill_in 'search', with: 'testing 123'
         find('.member-search-btn').click
@@ -57,7 +57,7 @@ feature 'Projects > Members > Anonymous user sees members', js: true do
       expect(page).not_to have_selector('.group_member')
     end
 
-    it 'finds results' do
+    scenario 'finds results' do
       page.within '.member-search-form' do
         fill_in 'search', with: group.name
         find('.member-search-btn').click
diff --git a/spec/features/projects/members/share_with_group_spec.rb b/spec/features/projects/members/share_with_group_spec.rb
new file mode 100644
index 00000000000..3b368f8e25d
--- /dev/null
+++ b/spec/features/projects/members/share_with_group_spec.rb
@@ -0,0 +1,191 @@
+require 'spec_helper'
+
+feature 'Project > Members > Share with Group', :js do
+  include Select2Helper
+  include ActionView::Helpers::DateHelper
+
+  let(:master) { create(:user) }
+
+  describe 'Share with group lock' do
+    shared_examples 'the project can be shared with groups' do
+      scenario 'the "Share with group" tab exists' do
+        visit project_settings_members_path(project)
+        expect(page).to have_selector('#share-with-group-tab')
+      end
+    end
+
+    shared_examples 'the project cannot be shared with groups' do
+      scenario 'the "Share with group" tab does not exist' do
+        visit project_settings_members_path(project)
+        expect(page).to have_selector('#add-member-tab')
+        expect(page).not_to have_selector('#share-with-group-tab')
+      end
+    end
+
+    context 'for a project in a root group' do
+      let!(:group_to_share_with) { create(:group) }
+      let(:project) { create(:project, namespace: create(:group)) }
+
+      background do
+        project.add_master(master)
+        sign_in(master)
+      end
+
+      context 'when the group has "Share with group lock" disabled' do
+        it_behaves_like 'the project can be shared with groups'
+
+        scenario 'the project can be shared with another group' do
+          visit project_settings_members_path(project)
+
+          click_on 'share-with-group-tab'
+
+          select2 group_to_share_with.id, from: '#link_group_id'
+          page.find('body').click
+          find('.btn-create').trigger('click')
+
+          page.within('.project-members-groups') do
+            expect(page).to have_content(group_to_share_with.name)
+          end
+        end
+      end
+
+      context 'when the group has "Share with group lock" enabled' do
+        before do
+          project.namespace.update_column(:share_with_group_lock, true)
+        end
+
+        it_behaves_like 'the project cannot be shared with groups'
+      end
+    end
+
+    context 'for a project in a subgroup', :nested_groups do
+      let!(:group_to_share_with) { create(:group) }
+      let(:root_group) { create(:group) }
+      let(:subgroup) { create(:group, parent: root_group) }
+      let(:project) { create(:project, namespace: subgroup) }
+
+      background do
+        project.add_master(master)
+        sign_in(master)
+      end
+
+      context 'when the root_group has "Share with group lock" disabled' do
+        context 'when the subgroup has "Share with group lock" disabled' do
+          it_behaves_like 'the project can be shared with groups'
+        end
+
+        context 'when the subgroup has "Share with group lock" enabled' do
+          before do
+            subgroup.update_column(:share_with_group_lock, true)
+          end
+
+          it_behaves_like 'the project cannot be shared with groups'
+        end
+      end
+
+      context 'when the root_group has "Share with group lock" enabled' do
+        before do
+          root_group.update_column(:share_with_group_lock, true)
+        end
+
+        context 'when the subgroup has "Share with group lock" disabled (parent overridden)' do
+          it_behaves_like 'the project can be shared with groups'
+        end
+
+        context 'when the subgroup has "Share with group lock" enabled' do
+          before do
+            subgroup.update_column(:share_with_group_lock, true)
+          end
+
+          it_behaves_like 'the project cannot be shared with groups'
+        end
+      end
+    end
+  end
+
+  describe 'setting an expiration date for a group link' do
+    let(:project) { create(:project) }
+    let!(:group) { create(:group) }
+
+    around do |example|
+      Timecop.freeze { example.run }
+    end
+
+    before do
+      project.add_master(master)
+      sign_in(master)
+
+      visit project_settings_members_path(project)
+
+      click_on 'share-with-group-tab'
+
+      select2 group.id, from: '#link_group_id'
+
+      fill_in 'expires_at_groups', with: (Time.now + 4.5.days).strftime('%Y-%m-%d')
+      page.find('body').click
+      find('.btn-create').trigger('click')
+    end
+
+    scenario 'the group link shows the expiration time with a warning class' do
+      page.within('.project-members-groups') do
+        # Using distance_of_time_in_words_to_now because it is not the same as
+        # subtraction, and this way avoids time zone issues as well
+        expires_in_text = distance_of_time_in_words_to_now(project.project_group_links.first.expires_at)
+        expect(page).to have_content(expires_in_text)
+        expect(page).to have_selector('.text-warning')
+      end
+    end
+  end
+
+  describe 'the groups dropdown' do
+    context 'with multiple groups to choose from' do
+      let(:project) { create(:project) }
+
+      background do
+        project.add_master(master)
+        sign_in(master)
+
+        create(:group).add_owner(master)
+        create(:group).add_owner(master)
+
+        visit project_settings_members_path(project)
+        execute_script 'GroupsSelect.PER_PAGE = 1;'
+        open_select2 '#link_group_id'
+      end
+
+      it 'should infinitely scroll' do
+        expect(find('.select2-drop .select2-results')).to have_selector('.select2-result', count: 1)
+
+        scroll_select2_to_bottom('.select2-drop .select2-results:visible')
+
+        expect(find('.select2-drop .select2-results')).to have_selector('.select2-result', count: 2)
+      end
+    end
+
+    context 'for a project in a nested group' do
+      let(:group) { create(:group) }
+      let!(:nested_group) { create(:group, parent: group) }
+      let!(:group_to_share_with) { create(:group) }
+      let!(:project) { create(:project, namespace: nested_group) }
+
+      background do
+        project.add_master(master)
+        sign_in(master)
+        group.add_master(master)
+        group_to_share_with.add_master(master)
+      end
+
+      scenario 'the groups dropdown does not show ancestors', :nested_groups do
+        visit project_settings_members_path(project)
+
+        click_on 'share-with-group-tab'
+        click_link 'Search for a group'
+
+        page.within '.select2-drop' do
+          expect(page).to have_content(group_to_share_with.name)
+          expect(page).not_to have_content(group.name)
+        end
+      end
+    end
+  end
+end
diff --git a/spec/features/projects/merge_requests/user_accepts_merge_request_spec.rb b/spec/features/projects/merge_requests/user_accepts_merge_request_spec.rb
new file mode 100644
index 00000000000..6c0b5e279d5
--- /dev/null
+++ b/spec/features/projects/merge_requests/user_accepts_merge_request_spec.rb
@@ -0,0 +1,65 @@
+require 'spec_helper'
+
+describe 'User accepts a merge request', :js do
+  let(:merge_request) { create(:merge_request, :with_diffs, :simple, source_project: project) }
+  let(:project) { create(:project, :public, :repository) }
+  let(:user) { create(:user) }
+
+  before do
+    project.add_developer(user)
+    sign_in(user)
+  end
+
+  context 'with removing the source branch' do
+    before do
+      visit(merge_request_path(merge_request))
+    end
+
+    it 'accepts a merge request' do
+      check('Remove source branch')
+      click_button('Merge')
+
+      expect(page).to have_content('The changes were merged into')
+      expect(page).not_to have_selector('.js-remove-branch-button')
+
+      # Wait for View Resource requests to complete so they don't blow up if they are
+      # only handled after `DatabaseCleaner` has already run.
+      wait_for_requests
+    end
+  end
+
+  context 'without removing the source branch' do
+    before do
+      visit(merge_request_path(merge_request))
+    end
+
+    it 'accepts a merge request' do
+      click_button('Merge')
+
+      expect(page).to have_content('The changes were merged into')
+      expect(page).to have_selector('.js-remove-branch-button')
+
+      # Wait for View Resource requests to complete so they don't blow up if they are
+      # only handled after `DatabaseCleaner` has already run
+      wait_for_requests
+    end
+  end
+
+  context 'when a URL has an anchor' do
+    before do
+      visit(merge_request_path(merge_request, anchor: 'note_123'))
+    end
+
+    it 'accepts a merge request' do
+      check('Remove source branch')
+      click_button('Merge')
+
+      expect(page).to have_content('The changes were merged into')
+      expect(page).not_to have_selector('.js-remove-branch-button')
+
+      # Wait for View Resource requests to complete so they don't blow up if they are
+      # only handled after `DatabaseCleaner` has already run
+      wait_for_requests
+    end
+  end
+end
diff --git a/spec/features/projects/merge_requests/user_reverts_merge_request_spec.rb b/spec/features/projects/merge_requests/user_reverts_merge_request_spec.rb
new file mode 100644
index 00000000000..a41d683dbbb
--- /dev/null
+++ b/spec/features/projects/merge_requests/user_reverts_merge_request_spec.rb
@@ -0,0 +1,59 @@
+require 'spec_helper'
+
+describe 'User reverts a merge request', :js do
+  let(:merge_request) { create(:merge_request, :with_diffs, :simple, source_project: project) }
+  let(:project) { create(:project, :public, :repository) }
+  let(:user) { create(:user) }
+
+  before do
+    project.add_developer(user)
+    sign_in(user)
+
+    visit(merge_request_path(merge_request))
+
+    click_button('Merge')
+
+    visit(merge_request_path(merge_request))
+  end
+
+  it 'reverts a merge request' do
+    find("a[href='#modal-revert-commit']").click
+
+    page.within('#modal-revert-commit') do
+      uncheck('create_merge_request')
+      click_button('Revert')
+    end
+
+    expect(page).to have_content('The merge request has been successfully reverted.')
+
+    wait_for_requests
+  end
+
+  it 'does not revert a merge request that was previously reverted' do
+    find("a[href='#modal-revert-commit']").click
+
+    page.within('#modal-revert-commit') do
+      uncheck('create_merge_request')
+      click_button('Revert')
+    end
+
+    find("a[href='#modal-revert-commit']").click
+
+    page.within('#modal-revert-commit') do
+      uncheck('create_merge_request')
+      click_button('Revert')
+    end
+
+    expect(page).to have_content('Sorry, we cannot revert this merge request automatically.')
+  end
+
+  it 'reverts a merge request in a new merge request' do
+    find("a[href='#modal-revert-commit']").click
+
+    page.within('#modal-revert-commit') do
+      click_button('Revert')
+    end
+
+    expect(page).to have_content('The merge request has been successfully reverted. You can now submit a merge request to get this change into the original branch.')
+  end
+end
diff --git a/spec/features/projects/milestones/user_interacts_with_labels_spec.rb b/spec/features/projects/milestones/user_interacts_with_labels_spec.rb
new file mode 100644
index 00000000000..f6a82f80d65
--- /dev/null
+++ b/spec/features/projects/milestones/user_interacts_with_labels_spec.rb
@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+describe 'User interacts with labels' do
+  let(:user) { create(:user) }
+  let(:project) { create(:project, namespace: user.namespace) }
+  let(:milestone) { create(:milestone, project: project, title: 'v2.2', description: '# Description header') }
+  let(:issue1) { create(:issue, project: project, title: 'Bugfix1', milestone: milestone) }
+  let(:issue2) { create(:issue, project: project, title: 'Bugfix2', milestone: milestone) }
+  let(:label_bug) { create(:label, project: project, title: 'bug') }
+  let(:label_feature) { create(:label, project: project, title: 'feature') }
+  let(:label_enhancement) { create(:label, project: project, title: 'enhancement') }
+
+  before do
+    project.add_master(user)
+    sign_in(user)
+
+    issue1.labels << [label_bug, label_feature]
+    issue2.labels << [label_bug, label_enhancement]
+
+    visit(project_milestones_path(project))
+  end
+
+  it 'shows the list of labels', :js do
+    click_link('v2.2')
+
+    page.within('.nav-sidebar') do
+      page.find(:xpath, "//a[@href='#tab-labels']").click
+    end
+
+    expect(page).to have_selector('ul.manage-labels-list')
+
+    wait_for_requests
+
+    page.within('#tab-labels') do
+      expect(page).to have_content(label_bug.title)
+      expect(page).to have_content(label_enhancement.title)
+      expect(page).to have_content(label_feature.title)
+    end
+  end
+end
diff --git a/spec/features/projects/settings/merge_requests_settings_spec.rb b/spec/features/projects/settings/merge_requests_settings_spec.rb
index 104ce08d9f3..b1ec556bf16 100644
--- a/spec/features/projects/settings/merge_requests_settings_spec.rb
+++ b/spec/features/projects/settings/merge_requests_settings_spec.rb
@@ -19,8 +19,8 @@ feature 'Project settings > Merge Requests', :js do
         expect(page).to have_content('Only allow merge requests to be merged if the pipeline succeeds')
         expect(page).to have_content('Only allow merge requests to be merged if all discussions are resolved')
 
-        select 'Disabled', from: "project_project_feature_attributes_merge_requests_access_level"
         within('.sharing-permissions-form') do
+          find('.project-feature-controls[data-for="project[project_feature_attributes][merge_requests_access_level]"] .project-feature-toggle').click
           click_on('Save changes')
         end
 
@@ -39,8 +39,8 @@ feature 'Project settings > Merge Requests', :js do
         expect(page).not_to have_content('Only allow merge requests to be merged if the pipeline succeeds')
         expect(page).to have_content('Only allow merge requests to be merged if all discussions are resolved')
 
-        select 'Everyone with access', from: "project_project_feature_attributes_builds_access_level"
         within('.sharing-permissions-form') do
+          find('.project-feature-controls[data-for="project[project_feature_attributes][builds_access_level]"] .project-feature-toggle').click
           click_on('Save changes')
         end
 
@@ -60,8 +60,8 @@ feature 'Project settings > Merge Requests', :js do
       expect(page).not_to have_content('Only allow merge requests to be merged if the pipeline succeeds')
       expect(page).not_to have_content('Only allow merge requests to be merged if all discussions are resolved')
 
-      select 'Everyone with access', from: "project_project_feature_attributes_merge_requests_access_level"
       within('.sharing-permissions-form') do
+        find('.project-feature-controls[data-for="project[project_feature_attributes][merge_requests_access_level]"] .project-feature-toggle').click
         click_on('Save changes')
       end
 
diff --git a/spec/features/projects/settings/pipelines_settings_spec.rb b/spec/features/projects/settings/pipelines_settings_spec.rb
index 232d796a200..975d204e75e 100644
--- a/spec/features/projects/settings/pipelines_settings_spec.rb
+++ b/spec/features/projects/settings/pipelines_settings_spec.rb
@@ -41,5 +41,15 @@ feature "Pipelines settings" do
       checkbox = find_field('project_auto_cancel_pending_pipelines')
       expect(checkbox).to be_checked
     end
+
+    scenario 'update auto devops settings' do
+      fill_in('project_auto_devops_attributes_domain', with: 'test.com')
+      page.choose('project_auto_devops_attributes_enabled_false')
+      click_on 'Save changes'
+
+      expect(page.status_code).to eq(200)
+      expect(project.auto_devops).to be_present
+      expect(project.auto_devops).not_to be_enabled
+    end
   end
 end
diff --git a/spec/features/projects/settings/user_manages_group_links_spec.rb b/spec/features/projects/settings/user_manages_group_links_spec.rb
new file mode 100644
index 00000000000..91e8059865c
--- /dev/null
+++ b/spec/features/projects/settings/user_manages_group_links_spec.rb
@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+describe 'User manages group links' do
+  include Select2Helper
+
+  let(:user) { create(:user) }
+  let(:project) { create(:project, namespace: user.namespace) }
+  let(:group_ops) { create(:group, name: 'Ops') }
+  let(:group_market) { create(:group, name: 'Market', path: 'market') }
+
+  before do
+    project.add_master(user)
+    sign_in(user)
+
+    share_link = project.project_group_links.new(group_access: Gitlab::Access::MASTER)
+    share_link.group_id = group_ops.id
+    share_link.save!
+
+    visit(project_group_links_path(project))
+  end
+
+  it 'shows a list of groups' do
+    page.within('.project-members-groups') do
+      expect(page).to have_content('Ops')
+      expect(page).not_to have_content('Market')
+    end
+  end
+
+  it 'shares a project with a group', :js do
+    click_link('Share with group')
+
+    select2(group_market.id, from: '#link_group_id')
+    select('Master', from: 'link_group_access')
+
+    click_button('Share')
+
+    page.within('.project-members-groups') do
+      expect(page).to have_content('Market')
+    end
+  end
+end
diff --git a/spec/features/projects/settings/user_manages_project_members_spec.rb b/spec/features/projects/settings/user_manages_project_members_spec.rb
new file mode 100644
index 00000000000..2709047b8de
--- /dev/null
+++ b/spec/features/projects/settings/user_manages_project_members_spec.rb
@@ -0,0 +1,68 @@
+require 'spec_helper'
+
+describe 'User manages project members' do
+  let(:group) { create(:group, name: 'OpenSource') }
+  let(:project) { create(:project) }
+  let(:project2) { create(:project) }
+  let(:user) { create(:user) }
+  let(:user_dmitriy) { create(:user, name: 'Dmitriy') }
+  let(:user_mike) { create(:user, name: 'Mike') }
+
+  before do
+    project.add_master(user)
+    project.add_developer(user_dmitriy)
+    sign_in(user)
+  end
+
+  it 'cancels a team member' do
+    visit(project_project_members_path(project))
+
+    project_member = project.project_members.find_by(user_id: user_dmitriy.id)
+
+    page.within("#project_member_#{project_member.id}") do
+      click_link('Remove user from project')
+    end
+
+    visit(project_project_members_path(project))
+
+    expect(page).not_to have_content(user_dmitriy.name)
+    expect(page).not_to have_content(user_dmitriy.username)
+  end
+
+  it 'imports a team from another project' do
+    project2.add_master(user)
+    project2.add_reporter(user_mike)
+
+    visit(project_project_members_path(project))
+
+    page.within('.users-project-form') do
+      click_link('Import')
+    end
+
+    select(project2.name_with_namespace, from: 'source_project_id')
+    click_button('Import')
+
+    project_member = project.project_members.find_by(user_id: user_mike.id)
+
+    page.within("#project_member_#{project_member.id}") do
+      expect(page).to have_content('Mike')
+      expect(page).to have_content('Reporter')
+    end
+  end
+
+  it 'shows all members of project shared group' do
+    group.add_owner(user)
+    group.add_developer(user_dmitriy)
+
+    share_link = project.project_group_links.new(group_access: Gitlab::Access::MASTER)
+    share_link.group_id = group.id
+    share_link.save!
+
+    visit(project_project_members_path(project))
+
+    page.within('.project-members-groups') do
+      expect(page).to have_content('OpenSource')
+      expect(first('.group_member')).to have_content('Master')
+    end
+  end
+end
diff --git a/spec/features/projects/settings/visibility_settings_spec.rb b/spec/features/projects/settings/visibility_settings_spec.rb
index 1756c7d00fe..37ee6255bd1 100644
--- a/spec/features/projects/settings/visibility_settings_spec.rb
+++ b/spec/features/projects/settings/visibility_settings_spec.rb
@@ -11,19 +11,19 @@ feature 'Visibility settings', js: true do
     end
 
     scenario 'project visibility select is available' do
-      visibility_select_container = find('.js-visibility-select')
+      visibility_select_container = find('.project-visibility-setting')
 
-      expect(visibility_select_container.find('.visibility-select').value).to eq project.visibility_level.to_s
-      expect(visibility_select_container).to have_content 'The project can be accessed without any authentication.'
+      expect(visibility_select_container.find('select').value).to eq project.visibility_level.to_s
+      expect(visibility_select_container).to have_content 'The project can be accessed by anyone, regardless of authentication.'
     end
 
     scenario 'project visibility description updates on change' do
-      visibility_select_container = find('.js-visibility-select')
-      visibility_select = visibility_select_container.find('.visibility-select')
+      visibility_select_container = find('.project-visibility-setting')
+      visibility_select = visibility_select_container.find('select')
       visibility_select.select('Private')
 
       expect(visibility_select.value).to eq '0'
-      expect(visibility_select_container).to have_content 'Project access must be granted explicitly to each user.'
+      expect(visibility_select_container).to have_content 'Access must be granted explicitly to each user.'
     end
   end
 
@@ -37,11 +37,10 @@ feature 'Visibility settings', js: true do
     end
 
     scenario 'project visibility is locked' do
-      visibility_select_container = find('.js-visibility-select')
+      visibility_select_container = find('.project-visibility-setting')
 
-      expect(visibility_select_container).not_to have_select '.visibility-select'
-      expect(visibility_select_container).to have_content 'Public'
-      expect(visibility_select_container).to have_content 'The project can be accessed without any authentication.'
+      expect(visibility_select_container).to have_selector 'select[name="project[visibility_level]"]:disabled'
+      expect(visibility_select_container).to have_content 'The project can be accessed by anyone, regardless of authentication.'
     end
   end
 end
diff --git a/spec/features/projects/sub_group_issuables_spec.rb b/spec/features/projects/sub_group_issuables_spec.rb
index b2b39dbd24c..eb2d3ff50a0 100644
--- a/spec/features/projects/sub_group_issuables_spec.rb
+++ b/spec/features/projects/sub_group_issuables_spec.rb
@@ -26,7 +26,6 @@ describe 'Subgroup Issuables', :js, :nested_groups do
   def expect_to_have_full_subgroup_title
     title = find('.breadcrumbs-links')
 
-    expect(title).not_to have_selector '.initializing'
-    expect(title).to have_content 'group / subgroup / project'
+    expect(title).to have_content 'group subgroup project'
   end
 end
diff --git a/spec/features/projects/user_browses_a_tree_with_a_folder_containing_only_a_folder.rb b/spec/features/projects/user_browses_a_tree_with_a_folder_containing_only_a_folder.rb
new file mode 100644
index 00000000000..a17e65cc5b9
--- /dev/null
+++ b/spec/features/projects/user_browses_a_tree_with_a_folder_containing_only_a_folder.rb
@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+# This is a regression test for https://gitlab.com/gitlab-org/gitlab-ce/issues/37569
+describe 'User browses a tree with a folder containing only a folder' do
+  let(:project) { create(:project, :empty_repo) }
+  let(:user) { project.creator }
+
+  before do
+    # We need to disable the tree.flat_path provided by Gitaly to reproduce the issue
+    allow(Gitlab::GitalyClient).to receive(:feature_enabled?).and_return(false)
+
+    project.repository.create_dir(user, 'foo/bar', branch_name: 'master', message: 'Add the foo/bar folder')
+    sign_in(user)
+    visit(project_tree_path(project, project.repository.root_ref))
+  end
+
+  it 'shows the nested folder on a single row' do
+    expect(page).to have_content('foo/bar')
+  end
+end
diff --git a/spec/features/projects/wiki/user_creates_wiki_page_spec.rb b/spec/features/projects/wiki/user_creates_wiki_page_spec.rb
index ada08d594a3..e72b7dc0dd5 100644
--- a/spec/features/projects/wiki/user_creates_wiki_page_spec.rb
+++ b/spec/features/projects/wiki/user_creates_wiki_page_spec.rb
@@ -1,38 +1,75 @@
 require 'spec_helper'
 
-feature 'Projects > Wiki > User creates wiki page', :js do
+describe 'User creates wiki page' do
   let(:user) { create(:user) }
 
-  background do
-    project.team << [user, :master]
+  before do
+    project.add_master(user)
     sign_in(user)
 
-    visit project_path(project)
+    visit(project_wikis_path(project))
   end
 
-  context 'in the user namespace' do
-    let(:project) { create(:project, namespace: user.namespace) }
+  context 'when wiki is empty' do
+    context 'in a user namespace' do
+      let(:project) { create(:project, namespace: user.namespace) }
 
-    context 'when wiki is empty' do
-      before do
-        find('.shortcuts-wiki').click
+      it 'shows validation error message' do
+        page.within('.wiki-form') do
+          fill_in(:wiki_content, with: '')
+          click_on('Create page')
+        end
+
+        expect(page).to have_content('The form contains the following error:')
+        expect(page).to have_content("Content can't be blank")
+
+        page.within('.wiki-form') do
+          fill_in(:wiki_content, with: '[link test](test)')
+          click_on('Create page')
+        end
+
+        expect(page).to have_content('Home')
+        expect(page).to have_content('link test')
+
+        click_link('link test')
+
+        expect(page).to have_content('Create Page')
+      end
+
+      it 'shows non-escaped link in the pages list', :js do
+        click_link('New page')
+
+        page.within('#modal-new-wiki') do
+          fill_in(:new_wiki_path, with: 'one/two/three-test')
+          click_on('Create page')
+        end
+
+        page.within('.wiki-form') do
+          fill_in(:wiki_content, with: 'wiki content')
+          click_on('Create page')
+        end
+
+        expect(current_path).to include('one/two/three-test')
+        expect(page).to have_xpath("//a[@href='/#{project.full_path}/wikis/one/two/three-test']")
       end
 
-      scenario 'commit message field has value "Create home"' do
+      it 'has "Create home" as a commit message' do
         expect(page).to have_field('wiki[message]', with: 'Create home')
       end
 
-      scenario 'directly from the wiki home page' do
-        fill_in :wiki_content, with: 'My awesome wiki!'
-        page.within '.wiki-form' do
-          click_button 'Create page'
+      it 'creates a page from the home page' do
+        fill_in(:wiki_content, with: 'My awesome wiki!')
+
+        page.within('.wiki-form') do
+          click_button('Create page')
         end
+
         expect(page).to have_content('Home')
         expect(page).to have_content("Last edited by #{user.name}")
         expect(page).to have_content('My awesome wiki!')
       end
 
-      scenario 'creates ASCII wiki with LaTeX blocks' do
+      it 'creates ASCII wiki with LaTeX blocks', :js do
         stub_application_setting(plantuml_url: 'http://localhost', plantuml_enabled: true)
 
         ascii_content = <<~MD
@@ -54,10 +91,10 @@ feature 'Projects > Wiki > User creates wiki page', :js do
         MD
 
         find('#wiki_format option[value=asciidoc]').select_option
-        fill_in :wiki_content, with: ascii_content
+        fill_in(:wiki_content, with: ascii_content)
 
-        page.within '.wiki-form' do
-          click_button 'Create page'
+        page.within('.wiki-form') do
+          click_button('Create page')
         end
 
         page.within '.wiki' do
@@ -67,27 +104,49 @@ feature 'Projects > Wiki > User creates wiki page', :js do
       end
     end
 
-    context 'when wiki is not empty' do
-      before do
-        WikiPages::CreateService.new(project, user, title: 'home', content: 'Home page').execute
-        find('.shortcuts-wiki').click
+    context 'in a group namespace', :js do
+      let(:project) { create(:project, namespace: create(:group, :public)) }
+
+      it 'has "Create home" as a commit message' do
+        expect(page).to have_field('wiki[message]', with: 'Create home')
+      end
+
+      it 'creates a page from from the home page' do
+        page.within('.wiki-form') do
+          fill_in(:wiki_content, with: 'My awesome wiki!')
+          click_button('Create page')
+        end
+
+        expect(page).to have_content('Home')
+        expect(page).to have_content("Last edited by #{user.name}")
+        expect(page).to have_content('My awesome wiki!')
       end
+    end
+  end
+
+  context 'when wiki is not empty', :js do
+    before do
+      create(:wiki_page, wiki: create(:project, namespace: user.namespace).wiki, attrs: { title: 'home', content: 'Home page' })
+    end
+
+    context 'in a user namespace' do
+      let(:project) { create(:project, namespace: user.namespace) }
 
       context 'via the "new wiki page" page' do
-        scenario 'when the wiki page has a single word name' do
-          click_link 'New page'
+        it 'creates a page with a single word' do
+          click_link('New page')
 
-          page.within '#modal-new-wiki' do
-            fill_in :new_wiki_path, with: 'foo'
-            click_button 'Create page'
+          page.within('#modal-new-wiki') do
+            fill_in(:new_wiki_path, with: 'foo')
+            click_button('Create page')
           end
 
           # Commit message field should have correct value.
           expect(page).to have_field('wiki[message]', with: 'Create foo')
 
-          page.within '.wiki-form' do
-            fill_in :wiki_content, with: 'My awesome wiki!'
-            click_button 'Create page'
+          page.within('.wiki-form') do
+            fill_in(:wiki_content, with: 'My awesome wiki!')
+            click_button('Create page')
           end
 
           expect(page).to have_content('Foo')
@@ -95,20 +154,20 @@ feature 'Projects > Wiki > User creates wiki page', :js do
           expect(page).to have_content('My awesome wiki!')
         end
 
-        scenario 'when the wiki page has spaces in the name' do
-          click_link 'New page'
+        it 'creates a page with spaces in the name' do
+          click_link('New page')
 
-          page.within '#modal-new-wiki' do
-            fill_in :new_wiki_path, with: 'Spaces in the name'
-            click_button 'Create page'
+          page.within('#modal-new-wiki') do
+            fill_in(:new_wiki_path, with: 'Spaces in the name')
+            click_button('Create page')
           end
 
           # Commit message field should have correct value.
           expect(page).to have_field('wiki[message]', with: 'Create spaces in the name')
 
-          page.within '.wiki-form' do
-            fill_in :wiki_content, with: 'My awesome wiki!'
-            click_button 'Create page'
+          page.within('.wiki-form') do
+            fill_in(:wiki_content, with: 'My awesome wiki!')
+            click_button('Create page')
           end
 
           expect(page).to have_content('Spaces in the name')
@@ -116,20 +175,20 @@ feature 'Projects > Wiki > User creates wiki page', :js do
           expect(page).to have_content('My awesome wiki!')
         end
 
-        scenario 'when the wiki page has hyphens in the name' do
-          click_link 'New page'
+        it 'creates a page with hyphens in the name' do
+          click_link('New page')
 
-          page.within '#modal-new-wiki' do
-            fill_in :new_wiki_path, with: 'hyphens-in-the-name'
-            click_button 'Create page'
+          page.within('#modal-new-wiki') do
+            fill_in(:new_wiki_path, with: 'hyphens-in-the-name')
+            click_button('Create page')
           end
 
           # Commit message field should have correct value.
           expect(page).to have_field('wiki[message]', with: 'Create hyphens in the name')
 
-          page.within '.wiki-form' do
-            fill_in :wiki_content, with: 'My awesome wiki!'
-            click_button 'Create page'
+          page.within('.wiki-form') do
+            fill_in(:wiki_content, with: 'My awesome wiki!')
+            click_button('Create page')
           end
 
           expect(page).to have_content('Hyphens in the name')
@@ -138,73 +197,47 @@ feature 'Projects > Wiki > User creates wiki page', :js do
         end
       end
 
-      scenario 'content has autocomplete' do
-        click_link 'New page'
+      it 'shows the autocompletion dropdown' do
+        click_link('New page')
 
-        page.within '#modal-new-wiki' do
-          fill_in :new_wiki_path, with: 'test-autocomplete'
-          click_button 'Create page'
+        page.within('#modal-new-wiki') do
+          fill_in(:new_wiki_path, with: 'test-autocomplete')
+          click_button('Create page')
         end
 
-        page.within '.wiki-form' do
+        page.within('.wiki-form') do
           find('#wiki_content').native.send_keys('')
-          fill_in :wiki_content, with: '@'
+          fill_in(:wiki_content, with: '@')
         end
 
         expect(page).to have_selector('.atwho-view')
       end
     end
-  end
-
-  context 'in a group namespace' do
-    let(:project) { create(:project, namespace: create(:group, :public)) }
 
-    context 'when wiki is empty' do
-      before do
-        find('.shortcuts-wiki').click
-      end
-
-      scenario 'commit message field has value "Create home"' do
-        expect(page).to have_field('wiki[message]', with: 'Create home')
-      end
+    context 'in a group namespace' do
+      let(:project) { create(:project, namespace: create(:group, :public)) }
 
-      scenario 'directly from the wiki home page' do
-        fill_in :wiki_content, with: 'My awesome wiki!'
-        page.within '.wiki-form' do
-          click_button 'Create page'
-        end
-
-        expect(page).to have_content('Home')
-        expect(page).to have_content("Last edited by #{user.name}")
-        expect(page).to have_content('My awesome wiki!')
-      end
-    end
-
-    context 'when wiki is not empty' do
-      before do
-        WikiPages::CreateService.new(project, user, title: 'home', content: 'Home page').execute
-        find('.shortcuts-wiki').click
-      end
+      context 'via the "new wiki page" page' do
+        it 'creates a page' do
+          click_link('New page')
 
-      scenario 'via the "new wiki page" page' do
-        click_link 'New page'
+          page.within('#modal-new-wiki') do
+            fill_in(:new_wiki_path, with: 'foo')
+            click_button('Create page')
+          end
 
-        page.within '#modal-new-wiki' do
-          fill_in :new_wiki_path, with: 'foo'
-          click_button 'Create page'
-        end
+          # Commit message field should have correct value.
+          expect(page).to have_field('wiki[message]', with: 'Create foo')
 
-        # Commit message field should have correct value.
-        expect(page).to have_field('wiki[message]', with: 'Create foo')
+          page.within('.wiki-form') do
+            fill_in(:wiki_content, with: 'My awesome wiki!')
+            click_button('Create page')
+          end
 
-        page.within '.wiki-form' do
-          fill_in :wiki_content, with: 'My awesome wiki!'
-          click_button 'Create page'
+          expect(page).to have_content('Foo')
+          expect(page).to have_content("Last edited by #{user.name}")
+          expect(page).to have_content('My awesome wiki!')
         end
-
-        expect(page).to have_content('Foo')
-        expect(page).to have_content("Last edited by #{user.name}")
-        expect(page).to have_content('My awesome wiki!')
       end
     end
   end
diff --git a/spec/features/projects/wiki/user_deletes_wiki_page_spec.rb b/spec/features/projects/wiki/user_deletes_wiki_page_spec.rb
new file mode 100644
index 00000000000..605e332196b
--- /dev/null
+++ b/spec/features/projects/wiki/user_deletes_wiki_page_spec.rb
@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+feature 'User deletes wiki page' do
+  let(:user) { create(:user) }
+  let(:project) { create(:project, namespace: user.namespace) }
+  let(:wiki_page) { create(:wiki_page, wiki: project.wiki) }
+
+  before do
+    sign_in(user)
+    visit(project_wiki_path(project, wiki_page))
+  end
+
+  it 'deletes a page' do
+    click_on('Edit')
+    click_on('Delete')
+
+    expect(page).to have_content('Page was successfully deleted')
+  end
+end
diff --git a/spec/features/projects/wiki/user_updates_wiki_page_spec.rb b/spec/features/projects/wiki/user_updates_wiki_page_spec.rb
index 64a80aec205..1cf14204159 100644
--- a/spec/features/projects/wiki/user_updates_wiki_page_spec.rb
+++ b/spec/features/projects/wiki/user_updates_wiki_page_spec.rb
@@ -1,83 +1,154 @@
 require 'spec_helper'
 
-feature 'Projects > Wiki > User updates wiki page' do
+describe 'User updates wiki page' do
   let(:user) { create(:user) }
-  let!(:wiki_page) { WikiPages::CreateService.new(project, user, title: 'home', content: 'Home page').execute }
 
-  background do
-    project.team << [user, :master]
+  before do
+    project.add_master(user)
     sign_in(user)
+  end
+
+  context 'when wiki is empty' do
+    before do
+      visit(project_wikis_path(project))
+    end
+
+    context 'in a user namespace' do
+      let(:project) { create(:project, namespace: user.namespace) }
+
+      it 'redirects back to the home edit page' do
+        page.within(:css, '.wiki-form .form-actions') do
+          click_on('Cancel')
+        end
+
+        expect(current_path).to eq project_wiki_path(project, :home)
+      end
+
+      it 'updates a page that has a path', :js do
+        click_on('New page')
+
+        page.within('#modal-new-wiki') do
+          fill_in(:new_wiki_path, with: 'one/two/three-test')
+          click_on('Create page')
+        end
+
+        page.within '.wiki-form' do
+          fill_in(:wiki_content, with: 'wiki content')
+          click_on('Create page')
+        end
 
-    visit project_wikis_path(project)
+        expect(current_path).to include('one/two/three-test')
+        expect(find('.wiki-pages')).to have_content('Three')
+
+        click_on('Three')
+
+        expect(find('.nav-text')).to have_content('Three')
+
+        click_on('Edit')
+
+        expect(current_path).to include('one/two/three-test')
+        expect(page).to have_content('Edit Page')
+
+        fill_in('Content', with: 'Updated Wiki Content')
+        click_on('Save changes')
+
+        expect(page).to have_content('Updated Wiki Content')
+      end
+    end
   end
 
-  context 'in the user namespace' do
-    let(:project) { create(:project, namespace: user.namespace) }
+  context 'when wiki is not empty' do
+    let(:project_wiki) { create(:project_wiki, project: project, user: project.creator) }
+    let!(:wiki_page) { create(:wiki_page, wiki: project_wiki, attrs: { title: 'home', content: 'Home page' }) }
 
-    context 'the home page' do
-      scenario 'success when the wiki content is not empty' do
-        click_link 'Edit'
+    before do
+      visit(project_wikis_path(project))
+    end
+
+    context 'in a user namespace' do
+      let(:project) { create(:project, namespace: user.namespace) }
+
+      it 'updates a page' do
+        click_link('Edit')
 
         # Commit message field should have correct value.
         expect(page).to have_field('wiki[message]', with: 'Update home')
 
-        fill_in :wiki_content, with: 'My awesome wiki!'
-        click_button 'Save changes'
+        fill_in(:wiki_content, with: 'My awesome wiki!')
+        click_button('Save changes')
 
         expect(page).to have_content('Home')
         expect(page).to have_content("Last edited by #{user.name}")
         expect(page).to have_content('My awesome wiki!')
       end
 
-      scenario 'failure when the wiki content is empty' do
-        click_link 'Edit'
+      it 'shows a validation error message' do
+        click_link('Edit')
 
-        fill_in :wiki_content, with: ''
-        click_button 'Save changes'
+        fill_in(:wiki_content, with: '')
+        click_button('Save changes')
 
         expect(page).to have_selector('.wiki-form')
         expect(page).to have_content('Edit Page')
         expect(page).to have_content('The form contains the following error:')
-        expect(page).to have_content('Content can\'t be blank')
-        expect(find('textarea#wiki_content').value).to eq ''
+        expect(page).to have_content("Content can't be blank")
+        expect(find('textarea#wiki_content').value).to eq('')
       end
 
-      scenario 'content has autocomplete', :js do
-        click_link 'Edit'
+      it 'shows the autocompletion dropdown', :js do
+        click_link('Edit')
 
         find('#wiki_content').native.send_keys('')
-        fill_in :wiki_content, with: '@'
+        fill_in(:wiki_content, with: '@')
 
         expect(page).to have_selector('.atwho-view')
       end
-    end
 
-    scenario 'page has been updated since the user opened the edit page' do
-      click_link 'Edit'
+      it 'shows the error message' do
+        click_link('Edit')
+
+        wiki_page.update(content: 'Update')
 
-      wiki_page.update(content: 'Update')
+        click_button('Save changes')
+
+        expect(page).to have_content('Someone edited the page the same time you did.')
+      end
+
+      it 'updates a page' do
+        click_on('Edit')
+        fill_in('Content', with: 'Updated Wiki Content')
+        click_on('Save changes')
+
+        expect(page).to have_content('Updated Wiki Content')
+      end
 
-      click_button 'Save changes'
+      it 'cancels edititng of a page' do
+        click_on('Edit')
 
-      expect(page).to have_content 'Someone edited the page the same time you did.'
+        page.within(:css, '.wiki-form .form-actions') do
+          click_on('Cancel')
+        end
+
+        expect(current_path).to eq(project_wiki_path(project, wiki_page))
+      end
     end
-  end
 
-  context 'in a group namespace' do
-    let(:project) { create(:project, namespace: create(:group, :public)) }
+    context 'in a group namespace' do
+      let(:project) { create(:project, namespace: create(:group, :public)) }
 
-    scenario 'the home page' do
-      click_link 'Edit'
+      it 'updates a page' do
+        click_link('Edit')
 
-      # Commit message field should have correct value.
-      expect(page).to have_field('wiki[message]', with: 'Update home')
+        # Commit message field should have correct value.
+        expect(page).to have_field('wiki[message]', with: 'Update home')
 
-      fill_in :wiki_content, with: 'My awesome wiki!'
-      click_button 'Save changes'
+        fill_in(:wiki_content, with: 'My awesome wiki!')
+        click_button('Save changes')
 
-      expect(page).to have_content('Home')
-      expect(page).to have_content("Last edited by #{user.name}")
-      expect(page).to have_content('My awesome wiki!')
+        expect(page).to have_content('Home')
+        expect(page).to have_content("Last edited by #{user.name}")
+        expect(page).to have_content('My awesome wiki!')
+      end
     end
   end
 end
diff --git a/spec/features/projects/wiki/user_views_project_wiki_page_spec.rb b/spec/features/projects/wiki/user_views_project_wiki_page_spec.rb
deleted file mode 100644
index 92e96f11219..00000000000
--- a/spec/features/projects/wiki/user_views_project_wiki_page_spec.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-require 'spec_helper'
-
-feature 'Projects > Wiki > User views the wiki page' do
-  let(:user) { create(:user) }
-  let(:project) { create(:project, :public) }
-  let(:old_page_version_id) { wiki_page.versions.last.id }
-  let(:wiki_page) do
-    WikiPages::CreateService.new(
-      project,
-      user,
-      title: 'home',
-      content: '[some link](other-page)'
-    ).execute
-  end
-
-  background do
-    project.team << [user, :master]
-    sign_in(user)
-    WikiPages::UpdateService.new(
-      project,
-      user,
-      message: 'updated home',
-      content: 'updated [some link](other-page)',
-      format: :markdown
-    ).execute(wiki_page)
-  end
-
-  scenario 'Visit Wiki Page Current Commit' do
-    visit project_wiki_path(project, wiki_page)
-
-    expect(page).to have_selector('a.btn', text: 'Edit')
-  end
-
-  scenario 'Visit Wiki Page Historical Commit' do
-    visit project_wiki_path(project, wiki_page, version_id: old_page_version_id)
-
-    expect(page).not_to have_selector('a.btn', text: 'Edit')
-  end
-end
diff --git a/spec/features/projects/wiki/user_views_wiki_page_spec.rb b/spec/features/projects/wiki/user_views_wiki_page_spec.rb
new file mode 100644
index 00000000000..d201d4f6b98
--- /dev/null
+++ b/spec/features/projects/wiki/user_views_wiki_page_spec.rb
@@ -0,0 +1,140 @@
+require 'spec_helper'
+
+describe 'User views a wiki page' do
+  let(:user) { create(:user) }
+  let(:project) { create(:project, namespace: user.namespace) }
+  let(:wiki_page) do
+    create(:wiki_page,
+      wiki: project.wiki,
+      attrs: { title: 'home', content: 'Look at this [image](image.jpg)\n\n ![alt text](image.jpg)' })
+  end
+
+  before do
+    project.add_master(user)
+    sign_in(user)
+  end
+
+  context 'when wiki is empty' do
+    before do
+      visit(project_wikis_path(project))
+
+      click_on('New page')
+
+      page.within('#modal-new-wiki') do
+        fill_in(:new_wiki_path, with: 'one/two/three-test')
+        click_on('Create page')
+      end
+
+      page.within('.wiki-form') do
+        fill_in(:wiki_content, with: 'wiki content')
+        click_on('Create page')
+      end
+    end
+
+    it 'shows the history of a page that has a path', :js do
+      expect(current_path).to include('one/two/three-test')
+
+      click_on('Three')
+      click_on('Page history')
+
+      expect(current_path).to include('one/two/three-test')
+
+      page.within(:css, '.nav-text') do
+        expect(page).to have_content('History')
+      end
+    end
+
+    it 'shows an old version of a page', :js do
+      expect(current_path).to include('one/two/three-test')
+      expect(find('.wiki-pages')).to have_content('Three')
+
+      click_on('Three')
+
+      expect(find('.nav-text')).to have_content('Three')
+
+      click_on('Edit')
+
+      expect(current_path).to include('one/two/three-test')
+      expect(page).to have_content('Edit Page')
+
+      fill_in('Content', with: 'Updated Wiki Content')
+
+      click_on('Save changes')
+      click_on('Page history')
+
+      page.within(:css, '.nav-text') do
+        expect(page).to have_content('History')
+      end
+
+      find('a[href*="?version_id"]')
+    end
+  end
+
+  context 'when a page does not have history' do
+    before do
+      visit(project_wiki_path(project, wiki_page))
+    end
+
+    it 'shows all the pages' do
+      expect(page).to have_content(user.name)
+      expect(find('.wiki-pages')).to have_content(wiki_page.title.capitalize)
+    end
+
+    it 'shows a file stored in a page' do
+      file = Gollum::File.new(project.wiki)
+
+      allow_any_instance_of(Gollum::Wiki).to receive(:file).with('image.jpg', 'master', true).and_return(file)
+      allow_any_instance_of(Gollum::File).to receive(:mime_type).and_return('image/jpeg')
+
+      expect(page).to have_xpath('//img[@data-src="image.jpg"]')
+      expect(page).to have_link('image', href: "#{project.wiki.wiki_base_path}/image.jpg")
+
+      click_on('image')
+
+      expect(current_path).to match('wikis/image.jpg')
+      expect(page).not_to have_xpath('/html') # Page should render the image which means there is no html involved
+    end
+
+    it 'shows the creation page if file does not exist' do
+      expect(page).to have_link('image', href: "#{project.wiki.wiki_base_path}/image.jpg")
+
+      click_on('image')
+
+      expect(current_path).to match('wikis/image.jpg')
+      expect(page).to have_content('New Wiki Page')
+      expect(page).to have_content('Create page')
+    end
+  end
+
+  context 'when a page has history' do
+    before do
+      wiki_page.update(message: 'updated home', content: 'updated [some link](other-page)')
+    end
+
+    it 'shows the page history' do
+      visit(project_wiki_path(project, wiki_page))
+
+      expect(page).to have_selector('a.btn', text: 'Edit')
+
+      click_on('Page history')
+
+      expect(page).to have_content(user.name)
+      expect(page).to have_content("#{user.username} created page: home")
+      expect(page).to have_content('updated home')
+    end
+
+    it 'does not show the "Edit" button' do
+      visit(project_wiki_path(project, wiki_page, version_id: wiki_page.versions.last.id))
+
+      expect(page).not_to have_selector('a.btn', text: 'Edit')
+    end
+  end
+
+  it 'opens a default wiki page', :js do
+    visit(project_path(project))
+
+    find('.shortcuts-wiki').trigger('click')
+
+    expect(page).to have_content('Home · Create Page')
+  end
+end
diff --git a/spec/features/search_spec.rb b/spec/features/search_spec.rb
index 49f6ce91bbd..b9b3d10b5ef 100644
--- a/spec/features/search_spec.rb
+++ b/spec/features/search_spec.rb
@@ -295,7 +295,7 @@ describe "Search"  do
       fill_in 'search', with: 'foo'
       click_button 'Search'
 
-      expect(find('#group_id').value).to eq(project.namespace.id.to_s)
+      expect(find('#group_id', visible: false).value).to eq(project.namespace.id.to_s)
     end
 
     it 'preserves the project being searched in' do
@@ -304,7 +304,7 @@ describe "Search"  do
       fill_in 'search', with: 'foo'
       click_button 'Search'
 
-      expect(find('#project_id').value).to eq(project.id.to_s)
+      expect(find('#project_id', visible: false).value).to eq(project.id.to_s)
     end
   end
 end