Merge branch 'master' into 42431-add-auto-devops-and-clusters-button-to-projects

21 files changed, 992 insertions, 322 deletions

diff --git a/spec/features/groups/members/search_members_spec.rb b/spec/features/groups/members/search_members_spec.rb
new file mode 100644
index 00000000000..31fbbcf562c
--- /dev/null
+++ b/spec/features/groups/members/search_members_spec.rb
@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe 'Search group member' do
+  let(:user) { create :user }
+  let(:member) { create :user }
+
+  let!(:guest_group) do
+    create(:group) do |group|
+      group.add_guest(user)
+      group.add_guest(member)
+    end
+  end
+
+  before do
+    sign_in(user)
+    visit group_group_members_path(guest_group)
+  end
+
+  it 'renders member users' do
+    page.within '.member-search-form' do
+      fill_in 'search', with: member.name
+      find('.member-search-btn').click
+    end
+
+    group_members_list = find(".panel .content-list")
+    expect(group_members_list).to have_content(member.name)
+    expect(group_members_list).not_to have_content(user.name)
+  end
+end
diff --git a/spec/features/groups/milestone_spec.rb b/spec/features/groups/milestone_spec.rb
index 1b41b3842c8..20337f1d3b0 100644
--- a/spec/features/groups/milestone_spec.rb
+++ b/spec/features/groups/milestone_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-feature 'Group milestones', :js do
+feature 'Group milestones' do
   let(:group) { create(:group) }
   let!(:project) { create(:project_empty_repo, group: group) }
   let(:user) { create(:group_member, :master, user: create(:user), group: group ).user }
@@ -13,7 +13,7 @@ feature 'Group milestones', :js do
     sign_in(user)
   end
 
-  context 'create a milestone' do
+  context 'create a milestone', :js do
     before do
       visit new_group_milestone_path(group)
     end
@@ -61,55 +61,132 @@ feature 'Group milestones', :js do
   end
 
   context 'milestones list' do
-    let!(:other_project) { create(:project_empty_repo, group: group) }
-
-    let!(:active_project_milestone1) { create(:milestone, project: project, state: 'active', title: 'v1.0') }
-    let!(:active_project_milestone2) { create(:milestone, project: other_project, state: 'active', title: 'v1.0') }
-    let!(:closed_project_milestone1) { create(:milestone, project: project, state: 'closed', title: 'v2.0') }
-    let!(:closed_project_milestone2) { create(:milestone, project: other_project, state: 'closed', title: 'v2.0') }
-    let!(:active_group_milestone) { create(:milestone, group: group, state: 'active') }
-    let!(:closed_group_milestone) { create(:milestone, group: group, state: 'closed') }
-
-    before do
-      visit group_milestones_path(group)
+    context 'when no milestones' do
+      it 'renders no milestones text' do
+        visit group_milestones_path(group)
+        expect(page).to have_content('No milestones to show')
+      end
     end
 
-    it 'counts milestones correctly' do
-      expect(find('.top-area .active .badge').text).to eq("2")
-      expect(find('.top-area .closed .badge').text).to eq("2")
-      expect(find('.top-area .all .badge').text).to eq("4")
-    end
+    context 'when milestones exists' do
+      let!(:other_project) { create(:project_empty_repo, group: group) }
+
+      let!(:active_project_milestone1) do
+        create(
+          :milestone,
+          project: project,
+          state: 'active',
+          title: 'v1.0',
+          due_date: '2114-08-20',
+          description: 'Lorem Ipsum is simply dummy text'
+        )
+      end
+      let!(:active_project_milestone2) { create(:milestone, project: other_project, state: 'active', title: 'v1.0') }
+      let!(:closed_project_milestone1) { create(:milestone, project: project, state: 'closed', title: 'v2.0') }
+      let!(:closed_project_milestone2) { create(:milestone, project: other_project, state: 'closed', title: 'v2.0') }
+      let!(:active_group_milestone) { create(:milestone, group: group, state: 'active', title: 'GL-113') }
+      let!(:closed_group_milestone) { create(:milestone, group: group, state: 'closed') }
+      let!(:issue) do
+        create :issue, project: project, assignees: [user], author: user, milestone: active_project_milestone1
+      end
 
-    it 'lists legacy group milestones and group milestones' do
-      legacy_milestone = GroupMilestone.build_collection(group, group.projects, { state: 'active' }).first
+      before do
+        visit group_milestones_path(group)
+      end
 
-      expect(page).to have_selector("#milestone_#{active_group_milestone.id}", count: 1)
-      expect(page).to have_selector("#milestone_#{legacy_milestone.milestones.first.id}", count: 1)
-    end
+      it 'counts milestones correctly' do
+        expect(find('.top-area .active .badge').text).to eq("2")
+        expect(find('.top-area .closed .badge').text).to eq("2")
+        expect(find('.top-area .all .badge').text).to eq("4")
+      end
 
-    it 'updates milestone' do
-      page.within(".milestones #milestone_#{active_group_milestone.id}") do
-        click_link('Edit')
+      it 'lists legacy group milestones and group milestones' do
+        legacy_milestone = GroupMilestone.build_collection(group, group.projects, { state: 'active' }).first
+
+        expect(page).to have_selector("#milestone_#{active_group_milestone.id}", count: 1)
+        expect(page).to have_selector("#milestone_#{legacy_milestone.milestones.first.id}", count: 1)
       end
 
-      page.within('.milestone-form') do
-        fill_in 'milestone_title', with: 'new title'
-        click_button('Update milestone')
+      it 'updates milestone' do
+        page.within(".milestones #milestone_#{active_group_milestone.id}") do
+          click_link('Edit')
+        end
+
+        page.within('.milestone-form') do
+          fill_in 'milestone_title', with: 'new title'
+          click_button('Update milestone')
+        end
+
+        expect(find('#content-body h2')).to have_content('new title')
       end
 
-      expect(find('#content-body h2')).to have_content('new title')
-    end
+      it 'shows milestone detail and supports its edit' do
+        page.within(".milestones #milestone_#{active_group_milestone.id}") do
+          click_link(active_group_milestone.title)
+        end
+
+        page.within('.detail-page-header') do
+          click_link('Edit')
+        end
 
-    it 'shows milestone detail and supports its edit' do
-      page.within(".milestones #milestone_#{active_group_milestone.id}") do
-        click_link(active_group_milestone.title)
+        expect(page).to have_selector('.milestone-form')
       end
 
-      page.within('.detail-page-header') do
-        click_link('Edit')
+      it 'renders milestones' do
+        expect(page).to have_content('v1.0')
+        expect(page).to have_content('GL-113')
+        expect(page).to have_link(
+          '1 Issue',
+          href: issues_group_path(group, milestone_title: 'v1.0')
+        )
+        expect(page).to have_link(
+          '0 Merge Requests',
+          href: merge_requests_group_path(group, milestone_title: 'v1.0')
+        )
       end
 
-      expect(page).to have_selector('.milestone-form')
+      it 'renders group milestone details' do
+        click_link 'v1.0'
+
+        expect(page).to have_content('expires on Aug 20, 2114')
+        expect(page).to have_content('v1.0')
+        expect(page).to have_content('Issues 1 Open: 1 Closed: 0')
+        expect(page).to have_link(issue.title, href: project_issue_path(issue.project, issue))
+      end
+
+      describe 'labels' do
+        before do
+          create(:label, project: project, title: 'bug') do |label|
+            issue.labels << label
+          end
+
+          create(:label, project: project, title: 'feature') do |label|
+            issue.labels << label
+          end
+        end
+
+        it 'renders labels' do
+          click_link 'v1.0'
+
+          page.within('#tab-issues') do
+            expect(page).to have_content 'bug'
+            expect(page).to have_content 'feature'
+          end
+        end
+
+        it 'renders labels list', :js do
+          click_link 'v1.0'
+
+          page.within('.content .nav-links') do
+            page.find(:xpath, "//a[@href='#tab-labels']").click
+          end
+
+          page.within('#tab-labels') do
+            expect(page).to have_content 'bug'
+            expect(page).to have_content 'feature'
+          end
+        end
+      end
     end
   end
 end
diff --git a/spec/features/milestone_spec.rb b/spec/features/milestone_spec.rb
index b02d2d4261c..cc12a1005ba 100644
--- a/spec/features/milestone_spec.rb
+++ b/spec/features/milestone_spec.rb
@@ -66,15 +66,16 @@ feature 'Milestone' do
     end
   end
 
-  feature 'Open a milestone' do
+  feature 'Open a milestone', :js do
     scenario 'shows total issue time spent correctly when no time has been logged' do
       milestone = create(:milestone, project: project, title: 8.7)
 
       visit project_milestone_path(project, milestone)
 
-      page.within('.block.time_spent') do
-        expect(page).to have_content 'No time spent'
-        expect(page).to have_content 'None'
+      wait_for_requests
+
+      page.within('.time-tracking-no-tracking-pane') do
+        expect(page).to have_content 'No estimate or time spent'
       end
     end
 
@@ -89,8 +90,10 @@ feature 'Milestone' do
 
       visit project_milestone_path(project, milestone)
 
-      page.within('.block.time_spent') do
-        expect(page).to have_content '3h'
+      wait_for_requests
+
+      page.within('.time-tracking-spend-only-pane') do
+        expect(page).to have_content 'Spent: 3h'
       end
     end
   end
diff --git a/spec/features/profiles/password_spec.rb b/spec/features/profiles/password_spec.rb
index 4665626f114..1d7700b6767 100644
--- a/spec/features/profiles/password_spec.rb
+++ b/spec/features/profiles/password_spec.rb
@@ -1,6 +1,15 @@
 require 'spec_helper'
 
 describe 'Profile > Password' do
+  let(:user) { create(:user) }
+
+  def fill_passwords(password, confirmation)
+    fill_in 'New password',          with: password
+    fill_in 'Password confirmation', with: confirmation
+
+    click_button 'Save password'
+  end
+
   context 'Password authentication enabled' do
     let(:user) { create(:user, password_automatically_set: true) }
 
@@ -9,13 +18,6 @@ describe 'Profile > Password' do
       visit edit_profile_password_path
     end
 
-    def fill_passwords(password, confirmation)
-      fill_in 'New password',          with: password
-      fill_in 'Password confirmation', with: confirmation
-
-      click_button 'Save password'
-    end
-
     context 'User with password automatically set' do
       describe 'User puts different passwords in the field and in the confirmation' do
         it 'shows an error message' do
@@ -73,4 +75,64 @@ describe 'Profile > Password' do
       end
     end
   end
+
+  context 'Change passowrd' do
+    before do
+      sign_in(user)
+      visit(edit_profile_password_path)
+    end
+
+    it 'does not change user passowrd without old one' do
+      page.within '.update-password' do
+        fill_passwords('22233344', '22233344')
+      end
+
+      page.within '.flash-container' do
+        expect(page).to have_content 'You must provide a valid current password'
+      end
+    end
+
+    it 'does not change password with invalid old password' do
+      page.within '.update-password' do
+        fill_in 'user_current_password', with: 'invalid'
+        fill_passwords('password', 'confirmation')
+      end
+
+      page.within '.flash-container' do
+        expect(page).to have_content 'You must provide a valid current password'
+      end
+    end
+
+    it 'changes user password' do
+      page.within '.update-password' do
+        fill_in "user_current_password", with: user.password
+        fill_passwords('22233344', '22233344')
+      end
+
+      expect(current_path).to eq new_user_session_path
+    end
+  end
+
+  context 'when password is expired' do
+    before do
+      sign_in(user)
+
+      user.update_attributes(password_expires_at: 1.hour.ago)
+      user.identities.delete
+      expect(user.ldap_user?).to eq false
+    end
+
+    it 'needs change user password' do
+      visit edit_profile_password_path
+
+      expect(current_path).to eq new_profile_password_path
+
+      fill_in :user_current_password,      with: user.password
+      fill_in :user_password,              with: '12345678'
+      fill_in :user_password_confirmation, with: '12345678'
+      click_button 'Set new password'
+
+      expect(current_path).to eq new_user_session_path
+    end
+  end
 end
diff --git a/spec/features/profiles/user_edit_profile_spec.rb b/spec/features/profiles/user_edit_profile_spec.rb
new file mode 100644
index 00000000000..0b5eacbe916
--- /dev/null
+++ b/spec/features/profiles/user_edit_profile_spec.rb
@@ -0,0 +1,58 @@
+require 'spec_helper'
+
+describe 'User edit profile' do
+  let(:user) { create(:user) }
+
+  before do
+    sign_in(user)
+    visit(profile_path)
+  end
+
+  it 'changes user profile' do
+    fill_in 'user_skype', with: 'testskype'
+    fill_in 'user_linkedin', with: 'testlinkedin'
+    fill_in 'user_twitter', with: 'testtwitter'
+    fill_in 'user_website_url', with: 'testurl'
+    fill_in 'user_location', with: 'Ukraine'
+    fill_in 'user_bio', with: 'I <3 GitLab'
+    fill_in 'user_organization', with: 'GitLab'
+    click_button 'Update profile settings'
+
+    expect(user.reload).to have_attributes(
+      skype: 'testskype',
+      linkedin: 'testlinkedin',
+      twitter: 'testtwitter',
+      website_url: 'testurl',
+      bio: 'I <3 GitLab',
+      organization: 'GitLab'
+    )
+
+    expect(find('#user_location').value).to eq 'Ukraine'
+    expect(page).to have_content('Profile was successfully updated')
+  end
+
+  context 'user avatar' do
+    before do
+      attach_file(:user_avatar, Rails.root.join('spec', 'fixtures', 'banana_sample.gif'))
+      click_button 'Update profile settings'
+    end
+
+    it 'changes user avatar' do
+      expect(page).to have_link('Remove avatar')
+
+      user.reload
+      expect(user.avatar).to be_instance_of AvatarUploader
+      expect(user.avatar.url).to eq "/uploads/-/system/user/avatar/#{user.id}/banana_sample.gif"
+    end
+
+    it 'removes user avatar' do
+      click_link 'Remove avatar'
+
+      user.reload
+
+      expect(user.avatar?).to eq false
+      expect(page).not_to have_link('Remove avatar')
+      expect(page).to have_link('gravatar.com')
+    end
+  end
+end
diff --git a/spec/features/profiles/user_manages_applications_spec.rb b/spec/features/profiles/user_manages_applications_spec.rb
new file mode 100644
index 00000000000..387584fef62
--- /dev/null
+++ b/spec/features/profiles/user_manages_applications_spec.rb
@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe 'User manages applications' do
+  let(:user) { create(:user) }
+
+  before do
+    sign_in(user)
+    visit applications_profile_path
+  end
+
+  it 'manages applications' do
+    expect(page).to have_content 'Add new application'
+
+    fill_in :doorkeeper_application_name,         with: 'test'
+    fill_in :doorkeeper_application_redirect_uri, with: 'https://test.com'
+    click_on 'Save application'
+
+    expect(page).to have_content 'Application: test'
+    expect(page).to have_content 'Application Id'
+    expect(page).to have_content 'Secret'
+
+    click_on 'Edit'
+
+    expect(page).to have_content 'Edit application'
+    fill_in :doorkeeper_application_name, with: 'test_changed'
+    click_on 'Save application'
+
+    expect(page).to have_content 'test_changed'
+    expect(page).to have_content 'Application Id'
+    expect(page).to have_content 'Secret'
+
+    visit applications_profile_path
+
+    page.within '.oauth-applications' do
+      click_on 'Destroy'
+    end
+    expect(page.find('.oauth-applications')).not_to have_content 'test_changed'
+  end
+end
diff --git a/spec/features/profiles/user_visits_profile_authentication_log_spec.rb b/spec/features/profiles/user_visits_profile_authentication_log_spec.rb
index a50ebb29e01..0f419c3c2c0 100644
--- a/spec/features/profiles/user_visits_profile_authentication_log_spec.rb
+++ b/spec/features/profiles/user_visits_profile_authentication_log_spec.rb
@@ -3,13 +3,28 @@ require 'spec_helper'
 describe 'User visits the authentication log' do
   let(:user) { create(:user) }
 
-  before do
-    sign_in(user)
+  context 'when user signed in' do
+    before do
+      sign_in(user)
+    end
 
-    visit(audit_log_profile_path)
+    it 'shows correct menu item' do
+      visit(audit_log_profile_path)
+
+      expect(page).to have_active_navigation('Authentication log')
+    end
   end
 
-  it 'shows correct menu item' do
-    expect(page).to have_active_navigation('Authentication log')
+  context 'when user has activity' do
+    before do
+      create(:closed_issue_event, author: user)
+      gitlab_sign_in(user)
+    end
+
+    it 'shows user activity' do
+      visit(audit_log_profile_path)
+
+      expect(page).to have_content 'Signed in with standard authentication'
+    end
   end
 end
diff --git a/spec/features/profiles/user_visits_profile_spec.rb b/spec/features/profiles/user_visits_profile_spec.rb
index a5d80439143..713112477c8 100644
--- a/spec/features/profiles/user_visits_profile_spec.rb
+++ b/spec/features/profiles/user_visits_profile_spec.rb
@@ -5,20 +5,58 @@ describe 'User visits their profile' do
 
   before do
     sign_in(user)
-
-    visit(profile_path)
   end
 
   it 'shows correct menu item' do
+    visit(profile_path)
+
     expect(page).to have_active_navigation('Profile')
   end
 
-  describe 'profile settings', :js do
-    it 'saves updates' do
-      fill_in 'user_bio', with: 'bio'
-      click_button 'Update profile settings'
+  it 'shows profile info' do
+    visit(profile_path)
+
+    expect(page).to have_content "This information will appear on your profile"
+  end
+
+  context 'when user has groups' do
+    let(:group) do
+      create :group do |group|
+        group.add_owner(user)
+      end
+    end
+
+    let!(:project) do
+      create(:project, :repository, namespace: group) do |project|
+        create(:closed_issue_event, project: project)
+        project.add_master(user)
+      end
+    end
+
+    def click_on_profile_picture
+      find(:css, '.header-user-dropdown-toggle').click
+
+      page.within ".header-user" do
+        click_link "Profile"
+      end
+    end
+
+    it 'shows user groups', :js do
+      visit(profile_path)
+      click_on_profile_picture
+
+      page.within ".cover-block" do
+        expect(page).to have_content user.name
+        expect(page).to have_content user.username
+      end
+
+      page.within ".content" do
+        click_link "Groups"
+      end
 
-      expect(page).to have_content('Profile was successfully updated')
+      page.within "#groups" do
+        expect(page).to have_content group.name
+      end
     end
   end
 end
diff --git a/spec/features/projects/clusters/gcp_spec.rb b/spec/features/projects/clusters/gcp_spec.rb
index 02dbd3380b3..4d47cdb500c 100644
--- a/spec/features/projects/clusters/gcp_spec.rb
+++ b/spec/features/projects/clusters/gcp_spec.rb
@@ -25,7 +25,7 @@ feature 'Gcp Cluster', :js do
     context 'when user has a GCP project with billing enabled' do
       before do
         allow_any_instance_of(Projects::Clusters::GcpController).to receive(:authorize_google_project_billing)
-        allow_any_instance_of(Projects::Clusters::GcpController).to receive(:google_project_billing_status).and_return('true')
+        allow_any_instance_of(Projects::Clusters::GcpController).to receive(:google_project_billing_status).and_return(true)
       end
 
       context 'when user does not have a cluster and visits cluster index page' do
@@ -134,7 +134,7 @@ feature 'Gcp Cluster', :js do
     context 'when user does not have a GCP project with billing enabled' do
       before do
         allow_any_instance_of(Projects::Clusters::GcpController).to receive(:authorize_google_project_billing)
-        allow_any_instance_of(Projects::Clusters::GcpController).to receive(:google_project_billing_status).and_return('false')
+        allow_any_instance_of(Projects::Clusters::GcpController).to receive(:google_project_billing_status).and_return(false)
 
         visit project_clusters_path(project)
 
diff --git a/spec/features/projects/members/share_with_group_spec.rb b/spec/features/projects/members/share_with_group_spec.rb
index 4cf48098401..134c8b8bc39 100644
--- a/spec/features/projects/members/share_with_group_spec.rb
+++ b/spec/features/projects/members/share_with_group_spec.rb
@@ -149,6 +149,11 @@ feature 'Project > Members > Share with Group', :js do
         create(:group).add_owner(master)
 
         visit project_settings_members_path(project)
+
+        click_link 'Share with group'
+
+        find('.ajax-groups-select.select2-container')
+
         execute_script 'GROUP_SELECT_PER_PAGE = 1;'
         open_select2 '#link_group_id'
       end
diff --git a/spec/features/projects/network_graph_spec.rb b/spec/features/projects/network_graph_spec.rb
new file mode 100644
index 00000000000..9f9a7787093
--- /dev/null
+++ b/spec/features/projects/network_graph_spec.rb
@@ -0,0 +1,108 @@
+require 'spec_helper'
+
+describe 'Project Network Graph', :js do
+  let(:user) { create :user }
+  let(:project) { create :project, :repository, namespace: user.namespace }
+
+  before do
+    sign_in(user)
+
+    # Stub Graph max_size to speed up test (10 commits vs. 650)
+    allow(Network::Graph).to receive(:max_count).and_return(10)
+  end
+
+  context 'when branch is master' do
+    def switch_ref_to(ref_name)
+      first('.js-project-refs-dropdown').click
+
+      page.within '.project-refs-form' do
+        click_link ref_name
+      end
+    end
+
+    def click_show_only_selected_branch_checkbox
+      find('#filter_ref').click
+    end
+
+    before do
+      visit project_network_path(project, 'master')
+    end
+
+    it 'renders project network' do
+      expect(page).to have_selector ".network-graph"
+      expect(page).to have_selector '.dropdown-menu-toggle', text: "master"
+      page.within '.network-graph' do
+        expect(page).to have_content 'master'
+      end
+    end
+
+    it 'switches ref to branch' do
+      switch_ref_to('feature')
+
+      expect(page).to have_selector '.dropdown-menu-toggle', text: 'feature'
+      page.within '.network-graph' do
+        expect(page).to have_content 'feature'
+      end
+    end
+
+    it 'switches ref to tag' do
+      switch_ref_to('v1.0.0')
+
+      expect(page).to have_selector '.dropdown-menu-toggle', text: 'v1.0.0'
+      page.within '.network-graph' do
+        expect(page).to have_content 'v1.0.0'
+      end
+    end
+
+    it 'renders by commit sha of "v1.0.0"' do
+      page.within ".network-form" do
+        fill_in 'extended_sha1', with: '6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9'
+        find('button').click
+      end
+
+      expect(page).to have_selector ".network-graph"
+      expect(page).to have_selector '.dropdown-menu-toggle', text: "master"
+      page.within '.network-graph' do
+        expect(page).to have_content 'v1.0.0'
+      end
+    end
+
+    it 'filters select tag' do
+      switch_ref_to('v1.0.0')
+
+      expect(page).to have_css 'title', text: 'Graph · v1.0.0', visible: false
+      page.within '.network-graph' do
+        expect(page).to have_content 'Change some files'
+      end
+
+      click_show_only_selected_branch_checkbox
+
+      page.within '.network-graph' do
+        expect(page).not_to have_content 'Change some files'
+      end
+
+      click_show_only_selected_branch_checkbox
+
+      page.within '.network-graph' do
+        expect(page).to have_content 'Change some files'
+      end
+    end
+
+    it 'renders error message when sha commit not exists' do
+      page.within ".network-form" do
+        fill_in 'extended_sha1', with: ';'
+        find('button').click
+      end
+
+      expect(page).to have_selector '.flash-alert', text: "Git revision ';' does not exist."
+    end
+  end
+
+  it 'renders project network with test branch' do
+    visit project_network_path(project, "'test'")
+
+    page.within '.network-graph' do
+      expect(page).to have_content "'test'"
+    end
+  end
+end
diff --git a/spec/features/projects/pages_spec.rb b/spec/features/projects/pages_spec.rb
index 2e334caa98f..3f1ef0b2a47 100644
--- a/spec/features/projects/pages_spec.rb
+++ b/spec/features/projects/pages_spec.rb
@@ -17,6 +17,7 @@ feature 'Pages' do
     scenario 'does not see anything to destroy' do
       visit project_pages_path(project)
 
+      expect(page).to have_content('Configure pages')
       expect(page).not_to have_link('Remove pages')
       expect(page).not_to have_text('Only the project owner can remove pages')
     end
@@ -32,14 +33,163 @@ feature 'Pages' do
         allow_any_instance_of(Project).to receive(:pages_deployed?) { true }
       end
 
-      scenario 'sees "Remove pages" link' do
+      scenario 'renders Access pages' do
         visit project_pages_path(project)
 
-        expect(page).to have_link('Remove pages')
+        expect(page).to have_content('Access pages')
+      end
+
+      context 'when support for external domains is disabled' do
+        before do
+          allow(Gitlab.config.pages).to receive(:external_http).and_return(nil)
+          allow(Gitlab.config.pages).to receive(:external_https).and_return(nil)
+        end
+
+        it 'renders message that support is disabled' do
+          visit project_pages_path(project)
+
+          expect(page).to have_content('Support for domains and certificates is disabled')
+        end
+      end
+
+      context 'when pages are exposed on external HTTP address' do
+        shared_examples 'adds new domain' do
+          it 'adds new domain' do
+            visit new_project_pages_domain_path(project)
+
+            fill_in 'Domain', with: 'my.test.domain.com'
+            click_button 'Create New Domain'
+
+            expect(page).to have_content('Domains (1)')
+            expect(page).to have_content('my.test.domain.com')
+          end
+        end
+
+        before do
+          allow(Gitlab.config.pages).to receive(:external_http).and_return(['1.1.1.1:80'])
+          allow(Gitlab.config.pages).to receive(:external_https).and_return(nil)
+        end
+
+        it 'allows to add new domain' do
+          visit project_pages_path(project)
+
+          expect(page).to have_content('New Domain')
+        end
+
+        it_behaves_like 'adds new domain'
+
+        context 'when project in group namespace' do
+          it_behaves_like 'adds new domain' do
+            let(:group) { create :group }
+            let(:project) { create :project, namespace: group }
+          end
+        end
+
+        context 'when pages domain is added' do
+          before do
+            project.pages_domains.create!(domain: 'my.test.domain.com')
+
+            visit new_project_pages_domain_path(project)
+          end
+
+          it 'renders certificates is disabled' do
+            expect(page).to have_content('Support for custom certificates is disabled')
+          end
+
+          it 'does not adds new domain and renders error message' do
+            fill_in 'Domain', with: 'my.test.domain.com'
+            click_button 'Create New Domain'
+
+            expect(page).to have_content('Domain has already been taken')
+          end
+        end
+      end
+
+      context 'when pages are exposed on external HTTPS address' do
+        let(:certificate_pem) do
+          <<~PEM
+          -----BEGIN CERTIFICATE-----
+          MIICGzCCAYSgAwIBAgIBATANBgkqhkiG9w0BAQUFADAbMRkwFwYDVQQDExB0ZXN0
+          LWNlcnRpZmljYXRlMB4XDTE2MDIxMjE0MzIwMFoXDTIwMDQxMjE0MzIwMFowGzEZ
+          MBcGA1UEAxMQdGVzdC1jZXJ0aWZpY2F0ZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAw
+          gYkCgYEApL4J9L0ZxFJ1hI1LPIflAlAGvm6ZEvoT4qKU5Xf2JgU7/2geNR1qlNFa
+          SvCc08Knupp5yTgmvyK/Xi09U0N82vvp4Zvr/diSc4A/RA6Mta6egLySNT438kdT
+          nY2tR5feoTLwQpX0t4IMlwGQGT5h6Of2fKmDxzuwuyffcIHqLdsCAwEAAaNvMG0w
+          DAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUxl9WSxBprB0z0ibJs3rXEk0+95AwCwYD
+          VR0PBAQDAgXgMBEGCWCGSAGG+EIBAQQEAwIGQDAeBglghkgBhvhCAQ0EERYPeGNh
+          IGNlcnRpZmljYXRlMA0GCSqGSIb3DQEBBQUAA4GBAGC4T8SlFHK0yPSa+idGLQFQ
+          joZp2JHYvNlTPkRJ/J4TcXxBTJmArcQgTIuNoBtC+0A/SwdK4MfTCUY4vNWNdese
+          5A4K65Nb7Oh1AdQieTBHNXXCdyFsva9/ScfQGEl7p55a52jOPs0StPd7g64uvjlg
+          YHi2yesCrOvVXt+lgPTd
+          -----END CERTIFICATE-----
+          PEM
+        end
+
+        let(:certificate_key) do
+          <<~KEY
+          -----BEGIN PRIVATE KEY-----
+          MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAKS+CfS9GcRSdYSN
+          SzyH5QJQBr5umRL6E+KilOV39iYFO/9oHjUdapTRWkrwnNPCp7qaeck4Jr8iv14t
+          PVNDfNr76eGb6/3YknOAP0QOjLWunoC8kjU+N/JHU52NrUeX3qEy8EKV9LeCDJcB
+          kBk+Yejn9nypg8c7sLsn33CB6i3bAgMBAAECgYA2D26w80T7WZvazYr86BNMePpd
+          j2mIAqx32KZHzt/lhh40J/SRtX9+Kl0Y7nBoRR5Ja9u/HkAIxNxLiUjwg9r6cpg/
+          uITEF5nMt7lAk391BuI+7VOZZGbJDsq2ulPd6lO+C8Kq/PI/e4kXcIjeH6KwQsuR
+          5vrXfBZ3sQfflaiN4QJBANBt8JY2LIGQF8o89qwUpRL5vbnKQ4IzZ5+TOl4RLR7O
+          AQpJ81tGuINghO7aunctb6rrcKJrxmEH1whzComybrMCQQDKV49nOBudRBAIgG4K
+          EnLzsRKISUHMZSJiYTYnablof8cKw1JaQduw7zgrUlLwnroSaAGX88+Jw1f5n2Lh
+          Vlg5AkBDdUGnrDLtYBCDEQYZHblrkc7ZAeCllDOWjxUV+uMqlCv8A4Ey6omvY57C
+          m6I8DkWVAQx8VPtozhvHjUw80rZHAkB55HWHAM3h13axKG0htCt7klhPsZHpx6MH
+          EPjGlXIT+aW2XiPmK3ZlCDcWIenE+lmtbOpI159Wpk8BGXs/s/xBAkEAlAY3ymgx
+          63BDJEwvOb2IaP8lDDxNsXx9XJNVvQbv5n15vNsLHbjslHfAhAbxnLQ1fLhUPqSi
+          nNp/xedE1YxutQ==
+          -----END PRIVATE KEY-----
+          KEY
+        end
+
+        before do
+          allow(Gitlab.config.pages).to receive(:external_http).and_return(['1.1.1.1:80'])
+          allow(Gitlab.config.pages).to receive(:external_https).and_return(['1.1.1.1:443'])
+        end
+
+        it 'adds new domain with certificate' do
+          visit new_project_pages_domain_path(project)
+
+          fill_in 'Domain', with: 'my.test.domain.com'
+          fill_in 'Certificate (PEM)', with: certificate_pem
+          fill_in 'Key (PEM)', with: certificate_key
+          click_button 'Create New Domain'
+
+          expect(page).to have_content('Domains (1)')
+          expect(page).to have_content('my.test.domain.com')
+        end
       end
     end
 
     it_behaves_like 'no pages deployed'
+
+    describe 'project settings page' do
+      it 'renders "Pages" tab' do
+        visit edit_project_path(project)
+
+        page.within '.nav-sidebar' do
+          expect(page).to have_link('Pages')
+        end
+      end
+
+      context 'when pages are disabled' do
+        before do
+          allow(Gitlab.config.pages).to receive(:enabled).and_return(false)
+        end
+
+        it 'does not render "Pages" tab' do
+          visit edit_project_path(project)
+
+          page.within '.nav-sidebar' do
+            expect(page).not_to have_link('Pages')
+          end
+        end
+      end
+    end
   end
 
   context 'when the user is not the owner' do
@@ -57,4 +207,54 @@ feature 'Pages' do
 
     it_behaves_like 'no pages deployed'
   end
+
+  describe 'Remove page' do
+    context 'when user is the owner' do
+      let(:project) { create :project, :repository }
+
+      before do
+        project.namespace.update(owner: user)
+      end
+
+      context 'when pages are deployed' do
+        let(:pipeline) do
+          commit_sha = project.commit('HEAD').sha
+
+          project.pipelines.create(
+            ref: 'HEAD',
+            sha: commit_sha,
+            source: :push,
+            protected: false
+          )
+        end
+
+        let(:ci_build) do
+          build(
+            :ci_build,
+            project: project,
+            pipeline: pipeline,
+            ref: 'HEAD',
+            legacy_artifacts_file: fixture_file_upload(Rails.root.join('spec/fixtures/pages.zip')),
+            legacy_artifacts_metadata: fixture_file_upload(Rails.root.join('spec/fixtures/pages.zip.meta'))
+          )
+        end
+
+        before do
+          result = Projects::UpdatePagesService.new(project, ci_build).execute
+          expect(result[:status]).to eq(:success)
+          expect(project).to be_pages_deployed
+        end
+
+        it 'removes the pages' do
+          visit project_pages_path(project)
+
+          expect(page).to have_link('Remove pages')
+
+          click_link 'Remove pages'
+
+          expect(project.pages_deployed?).to be_falsey
+        end
+      end
+    end
+  end
 end
diff --git a/spec/features/projects/services/user_activates_issue_tracker_spec.rb b/spec/features/projects/services/user_activates_issue_tracker_spec.rb
new file mode 100644
index 00000000000..e9502178bd7
--- /dev/null
+++ b/spec/features/projects/services/user_activates_issue_tracker_spec.rb
@@ -0,0 +1,92 @@
+require 'spec_helper'
+
+describe 'User activates issue tracker', :js do
+  let(:user) { create(:user) }
+  let(:project) { create(:project) }
+
+  let(:url) { 'http://tracker.example.com' }
+
+  def fill_form(active = true)
+    check 'Active' if active
+
+    fill_in 'service_project_url', with: url
+    fill_in 'service_issues_url', with: "#{url}/:id"
+    fill_in 'service_new_issue_url', with: url
+  end
+
+  before do
+    project.add_master(user)
+    sign_in(user)
+
+    visit project_settings_integrations_path(project)
+  end
+
+  shared_examples 'external issue tracker activation' do |tracker:|
+    describe 'user sets and activates the Service' do
+      context 'when the connection test succeeds' do
+        before do
+          stub_request(:head, url).to_return(headers: { 'Content-Type' => 'application/json' })
+
+          click_link(tracker)
+          fill_form
+          click_button('Test settings and save changes')
+          wait_for_requests
+        end
+
+        it 'activates the service' do
+          expect(page).to have_content("#{tracker} activated.")
+          expect(current_path).to eq(project_settings_integrations_path(project))
+        end
+
+        it 'shows the link in the menu' do
+          page.within('.nav-sidebar') do
+            expect(page).to have_link(tracker, href: url)
+          end
+        end
+      end
+
+      context 'when the connection test fails' do
+        it 'activates the service' do
+          stub_request(:head, url).to_raise(HTTParty::Error)
+
+          click_link(tracker)
+          fill_form
+          click_button('Test settings and save changes')
+          wait_for_requests
+
+          expect(find('.flash-container-page')).to have_content 'Test failed.'
+          expect(find('.flash-container-page')).to have_content 'Save anyway'
+
+          find('.flash-alert .flash-action').click
+          wait_for_requests
+
+          expect(page).to have_content("#{tracker} activated.")
+          expect(current_path).to eq(project_settings_integrations_path(project))
+        end
+      end
+    end
+
+    describe 'user sets the service but keeps it disabled' do
+      before do
+        click_link(tracker)
+        fill_form(false)
+        click_button('Save changes')
+      end
+
+      it 'saves but does not activate the service' do
+        expect(page).to have_content("#{tracker} settings saved, but not activated.")
+        expect(current_path).to eq(project_settings_integrations_path(project))
+      end
+
+      it 'does not show the external tracker link in the menu' do
+        page.within('.nav-sidebar') do
+          expect(page).not_to have_link(tracker, href: url)
+        end
+      end
+    end
+  end
+
+  it_behaves_like 'external issue tracker activation', tracker: 'Redmine'
+  it_behaves_like 'external issue tracker activation', tracker: 'Bugzilla'
+  it_behaves_like 'external issue tracker activation', tracker: 'Custom Issue Tracker'
+end
diff --git a/spec/features/projects/services/user_activates_jira_spec.rb b/spec/features/projects/services/user_activates_jira_spec.rb
index 028669eeaf2..429128ec096 100644
--- a/spec/features/projects/services/user_activates_jira_spec.rb
+++ b/spec/features/projects/services/user_activates_jira_spec.rb
@@ -3,7 +3,6 @@ require 'spec_helper'
 describe 'User activates Jira', :js do
   let(:user) { create(:user) }
   let(:project) { create(:project) }
-  let(:service) { project.create_jira_service }
 
   let(:url) { 'http://jira.example.com' }
   let(:test_url) { 'http://jira.example.com/rest/api/2/serverInfo' }
@@ -26,7 +25,7 @@ describe 'User activates Jira', :js do
 
   describe 'user sets and activates Jira Service' do
     context 'when Jira connection test succeeds' do
-      it 'activates the JIRA service' do
+      before do
         server_info = { key: 'value' }.to_json
         WebMock.stub_request(:get, test_url).with(basic_auth: %w(username password)).to_return(body: server_info)
 
@@ -34,10 +33,18 @@ describe 'User activates Jira', :js do
         fill_form
         click_button('Test settings and save changes')
         wait_for_requests
+      end
 
+      it 'activates the JIRA service' do
         expect(page).to have_content('JIRA activated.')
         expect(current_path).to eq(project_settings_integrations_path(project))
       end
+
+      it 'shows the JIRA link in the menu' do
+        page.within('.nav-sidebar') do
+          expect(page).to have_link('JIRA', href: url)
+        end
+      end
     end
 
     context 'when Jira connection test fails' do
@@ -75,14 +82,20 @@ describe 'User activates Jira', :js do
   end
 
   describe 'user sets Jira Service but keeps it disabled' do
-    context 'when Jira connection test succeeds' do
-      it 'activates the JIRA service' do
-        click_link('JIRA')
-        fill_form(false)
-        click_button('Save changes')
+    before do
+      click_link('JIRA')
+      fill_form(false)
+      click_button('Save changes')
+    end
 
-        expect(page).to have_content('JIRA settings saved, but not activated.')
-        expect(current_path).to eq(project_settings_integrations_path(project))
+    it 'saves but does not activate the JIRA service' do
+      expect(page).to have_content('JIRA settings saved, but not activated.')
+      expect(current_path).to eq(project_settings_integrations_path(project))
+    end
+
+    it 'does not show the JIRA link in the menu' do
+      page.within('.nav-sidebar') do
+        expect(page).not_to have_link('JIRA', href: url)
       end
     end
   end
diff --git a/spec/features/signup_spec.rb b/spec/features/signup_spec.rb
deleted file mode 100644
index 917fad74ef1..00000000000
--- a/spec/features/signup_spec.rb
+++ /dev/null
@@ -1,103 +0,0 @@
-require 'spec_helper'
-
-feature 'Signup' do
-  describe 'signup with no errors' do
-    context "when sending confirmation email" do
-      before do
-        stub_application_setting(send_user_confirmation_email: true)
-      end
-
-      it 'creates the user account and sends a confirmation email' do
-        user = build(:user)
-
-        visit root_path
-
-        fill_in 'new_user_name',                with: user.name
-        fill_in 'new_user_username',            with: user.username
-        fill_in 'new_user_email',               with: user.email
-        fill_in 'new_user_email_confirmation',  with: user.email
-        fill_in 'new_user_password',            with: user.password
-        click_button "Register"
-
-        expect(current_path).to eq users_almost_there_path
-        expect(page).to have_content("Please check your email to confirm your account")
-      end
-    end
-
-    context "when sigining up with different cased emails" do
-      it "creates the user successfully" do
-        user = build(:user)
-
-        visit root_path
-
-        fill_in 'new_user_name',                with: user.name
-        fill_in 'new_user_username',            with: user.username
-        fill_in 'new_user_email',               with: user.email
-        fill_in 'new_user_email_confirmation',  with: user.email.capitalize
-        fill_in 'new_user_password',            with: user.password
-        click_button "Register"
-
-        expect(current_path).to eq dashboard_projects_path
-        expect(page).to have_content("Welcome! You have signed up successfully.")
-      end
-    end
-
-    context "when not sending confirmation email" do
-      before do
-        stub_application_setting(send_user_confirmation_email: false)
-      end
-
-      it 'creates the user account and goes to dashboard' do
-        user = build(:user)
-
-        visit root_path
-
-        fill_in 'new_user_name',                with: user.name
-        fill_in 'new_user_username',            with: user.username
-        fill_in 'new_user_email',               with: user.email
-        fill_in 'new_user_email_confirmation',  with: user.email
-        fill_in 'new_user_password',            with: user.password
-        click_button "Register"
-
-        expect(current_path).to eq dashboard_projects_path
-        expect(page).to have_content("Welcome! You have signed up successfully.")
-      end
-    end
-  end
-
-  describe 'signup with errors' do
-    it "displays the errors" do
-      existing_user = create(:user)
-      user = build(:user)
-
-      visit root_path
-
-      fill_in 'new_user_name',     with: user.name
-      fill_in 'new_user_username', with: user.username
-      fill_in 'new_user_email',    with: existing_user.email
-      fill_in 'new_user_password', with: user.password
-      click_button "Register"
-
-      expect(current_path).to eq user_registration_path
-      expect(page).to have_content("errors prohibited this user from being saved")
-      expect(page).to have_content("Email has already been taken")
-      expect(page).to have_content("Email confirmation doesn't match")
-    end
-
-    it 'does not redisplay the password' do
-      existing_user = create(:user)
-      user = build(:user)
-
-      visit root_path
-
-      fill_in 'new_user_name',     with: user.name
-      fill_in 'new_user_username', with: user.username
-      fill_in 'new_user_email',    with: existing_user.email
-      fill_in 'new_user_password', with: user.password
-      click_button "Register"
-
-      expect(current_path).to eq user_registration_path
-      expect(page.body).not_to match(/#{user.password}/)
-    end
-  end
-end
diff --git a/spec/features/login_spec.rb b/spec/features/users/login_spec.rb
index 6dfabcc7225..6ef235cf870 100644
--- a/spec/features/login_spec.rb
+++ b/spec/features/users/login_spec.rb
@@ -1,6 +1,26 @@
 require 'spec_helper'
 
 feature 'Login' do
+  scenario 'Successful user signin invalidates password reset token' do
+    user = create(:user)
+
+    expect(user.reset_password_token).to be_nil
+
+    visit new_user_password_path
+    fill_in 'user_email', with: user.email
+    click_button 'Reset password'
+
+    user.reload
+    expect(user.reset_password_token).not_to be_nil
+
+    find('a[href="#login-pane"]').click
+    gitlab_sign_in(user)
+    expect(current_path).to eq root_path
+
+    user.reload
+    expect(user.reset_password_token).to be_nil
+  end
+
   describe 'initial login after setup' do
     it 'allows the initial admin to create a password' do
       # This behavior is dependent on there only being one user
diff --git a/spec/features/logout_spec.rb b/spec/features/users/logout_spec.rb
index 635729efa53..635729efa53 100644
--- a/spec/features/logout_spec.rb
+++ b/spec/features/users/logout_spec.rb
diff --git a/spec/features/users/projects_spec.rb b/spec/features/users/projects_spec.rb
deleted file mode 100644
index f079771cee1..00000000000
--- a/spec/features/users/projects_spec.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-require 'spec_helper'
-
-describe 'Projects tab on a user profile', :js do
-  let(:user) { create(:user) }
-  let!(:project) { create(:project, namespace: user.namespace) }
-  let!(:project2) { create(:project, namespace: user.namespace) }
-
-  before do
-    allow(Project).to receive(:default_per_page).and_return(1)
-
-    sign_in(user)
-
-    visit user_path(user)
-
-    page.within('.user-profile-nav') do
-      click_link('Personal projects')
-    end
-
-    wait_for_requests
-  end
-
-  it 'paginates results' do
-    expect(page).to have_content(project2.name)
-
-    click_link('Next')
-
-    expect(page).to have_content(project.name)
-  end
-end
diff --git a/spec/features/users/signup_spec.rb b/spec/features/users/signup_spec.rb
new file mode 100644
index 00000000000..5d539f0ccbe
--- /dev/null
+++ b/spec/features/users/signup_spec.rb
@@ -0,0 +1,135 @@
+require 'spec_helper'
+
+describe 'Signup' do
+  let(:new_user) { build_stubbed(:user) }
+
+  describe 'username validation', :js do
+    before do
+      visit root_path
+      click_link 'Register'
+    end
+
+    it 'does not show an error border if the username is available' do
+      fill_in 'new_user_username', with: 'new-user'
+      wait_for_requests
+
+      expect(find('.username')).not_to have_css '.gl-field-error-outline'
+    end
+
+    it 'does not show an error border if the username contains dots (.)' do
+      fill_in 'new_user_username', with: 'new.user.username'
+      wait_for_requests
+
+      expect(find('.username')).not_to have_css '.gl-field-error-outline'
+    end
+
+    it 'shows an error border if the username already exists' do
+      existing_user = create(:user)
+
+      fill_in 'new_user_username', with: existing_user.username
+      wait_for_requests
+
+      expect(find('.username')).to have_css '.gl-field-error-outline'
+    end
+
+    it 'shows an  error border if the username contains special characters' do
+      fill_in 'new_user_username', with: 'new$user!username'
+      wait_for_requests
+
+      expect(find('.username')).to have_css '.gl-field-error-outline'
+    end
+  end
+
+  context 'with no errors' do
+    context "when sending confirmation email" do
+      before do
+        stub_application_setting(send_user_confirmation_email: true)
+      end
+
+      it 'creates the user account and sends a confirmation email' do
+        visit root_path
+
+        fill_in 'new_user_name',                with: new_user.name
+        fill_in 'new_user_username',            with: new_user.username
+        fill_in 'new_user_email',               with: new_user.email
+        fill_in 'new_user_email_confirmation',  with: new_user.email
+        fill_in 'new_user_password',            with: new_user.password
+
+        expect { click_button 'Register' }.to change { User.count }.by(1)
+
+        expect(current_path).to eq users_almost_there_path
+        expect(page).to have_content("Please check your email to confirm your account")
+      end
+    end
+
+    context "when sigining up with different cased emails" do
+      it "creates the user successfully" do
+        visit root_path
+
+        fill_in 'new_user_name',                with: new_user.name
+        fill_in 'new_user_username',            with: new_user.username
+        fill_in 'new_user_email',               with: new_user.email
+        fill_in 'new_user_email_confirmation',  with: new_user.email.capitalize
+        fill_in 'new_user_password',            with: new_user.password
+        click_button "Register"
+
+        expect(current_path).to eq dashboard_projects_path
+        expect(page).to have_content("Welcome! You have signed up successfully.")
+      end
+    end
+
+    context "when not sending confirmation email" do
+      before do
+        stub_application_setting(send_user_confirmation_email: false)
+      end
+
+      it 'creates the user account and goes to dashboard' do
+        visit root_path
+
+        fill_in 'new_user_name',                with: new_user.name
+        fill_in 'new_user_username',            with: new_user.username
+        fill_in 'new_user_email',               with: new_user.email
+        fill_in 'new_user_email_confirmation',  with: new_user.email
+        fill_in 'new_user_password',            with: new_user.password
+        click_button "Register"
+
+        expect(current_path).to eq dashboard_projects_path
+        expect(page).to have_content("Welcome! You have signed up successfully.")
+      end
+    end
+  end
+
+  context 'with errors' do
+    it "displays the errors" do
+      existing_user = create(:user)
+
+      visit root_path
+
+      fill_in 'new_user_name',     with: new_user.name
+      fill_in 'new_user_username', with: new_user.username
+      fill_in 'new_user_email',    with: existing_user.email
+      fill_in 'new_user_password', with: new_user.password
+      click_button "Register"
+
+      expect(current_path).to eq user_registration_path
+      expect(page).to have_content("errors prohibited this user from being saved")
+      expect(page).to have_content("Email has already been taken")
+      expect(page).to have_content("Email confirmation doesn't match")
+    end
+
+    it 'does not redisplay the password' do
+      existing_user = create(:user)
+
+      visit root_path
+
+      fill_in 'new_user_name',     with: new_user.name
+      fill_in 'new_user_username', with: new_user.username
+      fill_in 'new_user_email',    with: existing_user.email
+      fill_in 'new_user_password', with: new_user.password
+      click_button "Register"
+
+      expect(current_path).to eq user_registration_path
+      expect(page.body).not_to match(/#{new_user.password}/)
+    end
+  end
+end
diff --git a/spec/features/user_page_spec.rb b/spec/features/users/user_browses_projects_on_user_page_spec.rb
index 19c587e53c8..a70637c8370 100644
--- a/spec/features/user_page_spec.rb
+++ b/spec/features/users/user_browses_projects_on_user_page_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'User page', :js do
+describe 'Users > User browses projects on user page', :js do
   let!(:user) { create :user }
   let!(:private_project) do
     create :project, :private, name: 'private', namespace: user.namespace do |project|
@@ -26,6 +26,28 @@ describe 'User page', :js do
     end
   end
 
+  it 'paginates projects', :js do
+    project = create(:project, namespace: user.namespace)
+    project2 = create(:project, namespace: user.namespace)
+    allow(Project).to receive(:default_per_page).and_return(1)
+
+    sign_in(user)
+
+    visit user_path(user)
+
+    page.within('.user-profile-nav') do
+      click_link('Personal projects')
+    end
+
+    wait_for_requests
+
+    expect(page).to have_content(project2.name)
+
+    click_link('Next')
+
+    expect(page).to have_content(project.name)
+  end
+
   context 'when not signed in' do
     it 'renders user public project' do
       visit user_path(user)
diff --git a/spec/features/users_spec.rb b/spec/features/users_spec.rb
deleted file mode 100644
index a9973cdf214..00000000000
--- a/spec/features/users_spec.rb
+++ /dev/null
@@ -1,114 +0,0 @@
-require 'spec_helper'
-
-feature 'Users', :js do
-  let(:user) { create(:user, username: 'user1', name: 'User 1', email: 'user1@gitlab.com') }
-
-  scenario 'GET /users/sign_in creates a new user account' do
-    visit new_user_session_path
-    click_link 'Register'
-    fill_in 'new_user_name',                with: 'Name Surname'
-    fill_in 'new_user_username',            with: 'Great'
-    fill_in 'new_user_email',               with: 'name@mail.com'
-    fill_in 'new_user_email_confirmation',  with: 'name@mail.com'
-    fill_in 'new_user_password',            with: 'password1234'
-    expect { click_button 'Register' }.to change { User.count }.by(1)
-  end
-
-  scenario 'Successful user signin invalidates password reset token' do
-    expect(user.reset_password_token).to be_nil
-
-    visit new_user_password_path
-    fill_in 'user_email', with: user.email
-    click_button 'Reset password'
-
-    user.reload
-    expect(user.reset_password_token).not_to be_nil
-
-    find('a[href="#login-pane"]').click
-    gitlab_sign_in(user)
-    expect(current_path).to eq root_path
-
-    user.reload
-    expect(user.reset_password_token).to be_nil
-  end
-
-  scenario 'Should show one error if email is already taken' do
-    visit new_user_session_path
-    click_link 'Register'
-    fill_in 'new_user_name',                with: 'Another user name'
-    fill_in 'new_user_username',            with: 'anotheruser'
-    fill_in 'new_user_email',               with: user.email
-    fill_in 'new_user_email_confirmation',  with: user.email
-    fill_in 'new_user_password',            with: '12341234'
-    expect { click_button 'Register' }.to change { User.count }.by(0)
-    expect(page).to have_text('Email has already been taken')
-    expect(number_of_errors_on_page(page)).to be(1), 'errors on page:\n #{errors_on_page page}'
-  end
-
-  describe 'redirect alias routes' do
-    before do
-      expect(user).to be_persisted
-    end
-
-    scenario '/u/user1 redirects to user page' do
-      visit '/u/user1'
-
-      expect(current_path).to eq user_path(user)
-      expect(page).to have_text(user.name)
-    end
-
-    scenario '/u/user1/groups redirects to user groups page' do
-      visit '/u/user1/groups'
-
-      expect(current_path).to eq user_groups_path(user)
-    end
-
-    scenario '/u/user1/projects redirects to user projects page' do
-      visit '/u/user1/projects'
-
-      expect(current_path).to eq user_projects_path(user)
-    end
-  end
-
-  feature 'username validation' do
-    let(:loading_icon) { '.fa.fa-spinner' }
-    let(:username_input) { 'new_user_username' }
-
-    before do
-      visit new_user_session_path
-      click_link 'Register'
-    end
-
-    scenario 'doesn\'t show an error border if the username is available' do
-      fill_in username_input, with: 'new-user'
-      wait_for_requests
-      expect(find('.username')).not_to have_css '.gl-field-error-outline'
-    end
-
-    scenario 'does not show an error border if the username contains dots (.)' do
-      fill_in username_input, with: 'new.user.username'
-      wait_for_requests
-      expect(find('.username')).not_to have_css '.gl-field-error-outline'
-    end
-
-    scenario 'shows an error border if the username already exists' do
-      fill_in username_input, with: user.username
-      wait_for_requests
-      expect(find('.username')).to have_css '.gl-field-error-outline'
-    end
-
-    scenario 'shows an  error border if the username contains special characters' do
-      fill_in username_input, with: 'new$user!username'
-      wait_for_requests
-      expect(find('.username')).to have_css '.gl-field-error-outline'
-    end
-  end
-
-  def errors_on_page(page)
-    page.find('#error_explanation').find('ul').all('li').map { |item| item.text }.join("\n")
-  end
-
-  def number_of_errors_on_page(page)
-    page.find('#error_explanation').find('ul').all('li').count
-  end
-end