diff --git a/features/project/project.feature b/features/project/project.feature
deleted file mode 100644
index 23817ef3ac92817b58f89a285927663194995306..0000000000000000000000000000000000000000
--- a/features/project/project.feature
+++ /dev/null
@@ -1,86 +0,0 @@
-Feature: Project
-  Background:
-    Given I sign in as a user
-    And I own project "Shop"
-    And project "Shop" has push event
-    And I visit project "Shop" page
-
-  Scenario: I edit the project avatar
-    Given I visit edit project "Shop" page
-    When I change the project avatar
-    And I should see new project avatar
-    And I should see the "Remove avatar" button
-
-  Scenario: I remove the project avatar
-    Given I visit edit project "Shop" page
-    And I have an project avatar
-    When I remove my project avatar
-    Then I should see the default project avatar
-    And I should not see the "Remove avatar" button
-
-  @javascript
-  Scenario: I should have readme on page
-    And I visit project "Shop" page
-    Then I should see project "Shop" README
-
-  Scenario: I should see last commit with CI
-    Given project "Shop" has CI enabled
-    Given project "Shop" has CI build
-    And I visit project "Shop" page
-    And I should see last commit with CI status
-
-  @javascript
-  Scenario: I should see project activity
-    When I visit project "Shop" activity page
-    Then I should see project "Shop" activity feed
-
-  Scenario: I visit edit project
-    When I visit edit project "Shop" page
-    Then I should see project settings
-
-  Scenario: I edit project
-    When I visit edit project "Shop" page
-    And change project settings
-    And I save project
-    Then I should see project with new settings
-
-  Scenario: I change project path
-    When I visit edit project "Shop" page
-    And change project path settings
-    Then I should see project with new path settings
-
-  Scenario: I should change project default branch
-    When I visit edit project "Shop" page
-    And change project default branch
-    And I save project
-    Then I should see project default branch changed
-
-  Scenario: I tag a project
-    When I visit edit project "Shop" page
-    Then I should see project settings
-    And I add project tags
-    And I save project
-    Then I should see project tags
-
-  Scenario: I should not see "New Issue" or "New Merge Request" buttons
-    Given I disable issues and merge requests in project
-    When I visit project "Shop" page
-    Then I should not see "New Issue" button
-    And I should not see "New Merge Request" button
-
-  Scenario: I should not see Project snippets
-    Given I disable snippets in project
-    When I visit project "Shop" page
-    Then I should not see "Snippets" button
-
-  @javascript
-  Scenario: I edit Project Notifications
-    Given I click notifications drop down button
-    When I choose Mention setting
-    Then I should see Notification saved message
-
-  Scenario: I should see command line instructions
-    Given I own an empty project
-    And I visit my empty project page
-    And I create bare repo
-    Then I should see command line instructions
diff --git a/features/steps/project/project.rb b/features/steps/project/project.rb
deleted file mode 100644
index bba30a723252172f0451f61fa1d3518c3c1d0913..0000000000000000000000000000000000000000
--- a/features/steps/project/project.rb
+++ /dev/null
@@ -1,154 +0,0 @@
-class Spinach::Features::Project < Spinach::FeatureSteps
-  include SharedAuthentication
-  include SharedProject
-  include SharedPaths
-  include WaitForRequests
-
-  step 'change project settings' do
-    fill_in 'project_name_edit', with: 'NewName'
-  end
-
-  step 'I save project' do
-    page.within '.general-settings' do
-      click_button 'Save changes'
-    end
-  end
-
-  step 'I should see project with new settings' do
-    expect(find_field('project_name').value).to eq 'NewName'
-  end
-
-  step 'change project path settings' do
-    fill_in 'project_path', with: 'new-path'
-    click_button 'Rename'
-  end
-
-  step 'I should see project with new path settings' do
-    expect(project.path).to eq 'new-path'
-  end
-
-  step 'I change the project avatar' do
-    attach_file(
-      :project_avatar,
-      File.join(Rails.root, 'spec', 'fixtures', 'banana_sample.gif')
-    )
-    page.within '.general-settings' do
-      click_button 'Save changes'
-    end
-    @project.reload
-  end
-
-  step 'I should see new project avatar' do
-    expect(@project.avatar).to be_instance_of AvatarUploader
-    url = @project.avatar.url
-    expect(url).to eq "/uploads/-/system/project/avatar/#{@project.id}/banana_sample.gif"
-  end
-
-  step 'I should see the "Remove avatar" button' do
-    expect(page).to have_link('Remove avatar')
-  end
-
-  step 'I have an project avatar' do
-    attach_file(
-      :project_avatar,
-      File.join(Rails.root, 'spec', 'fixtures', 'banana_sample.gif')
-    )
-    page.within '.general-settings' do
-      click_button 'Save changes'
-    end
-    @project.reload
-  end
-
-  step 'I remove my project avatar' do
-    click_link 'Remove avatar'
-    @project.reload
-  end
-
-  step 'I should see the default project avatar' do
-    expect(@project.avatar?).to eq false
-  end
-
-  step 'I should not see the "Remove avatar" button' do
-    expect(page).not_to have_link('Remove avatar')
-  end
-
-  step 'change project default branch' do
-    select 'fix', from: 'project_default_branch'
-    page.within '.general-settings' do
-      click_button 'Save changes'
-    end
-  end
-
-  step 'I should see project default branch changed' do
-    expect(find(:css, 'select#project_default_branch').value).to eq 'fix'
-  end
-
-  step 'I select project "Forum" README tab' do
-    click_link 'Readme'
-  end
-
-  step 'I should see project "Forum" README' do
-    page.within('.readme-holder') do
-      expect(page).to have_content 'Sample repo for testing gitlab features'
-    end
-  end
-
-  step 'I should see project "Shop" README' do
-    wait_for_requests
-    page.within('.readme-holder') do
-      expect(page).to have_content 'testme'
-    end
-  end
-
-  step 'I add project tags' do
-    fill_in 'Tags', with: 'tag1, tag2'
-  end
-
-  step 'I should see project tags' do
-    expect(find_field('Tags').value).to eq 'tag1, tag2'
-  end
-
-  step 'I should not see "New Issue" button' do
-    expect(page).not_to have_link 'New Issue'
-  end
-
-  step 'I should not see "New Merge Request" button' do
-    expect(page).not_to have_link 'New Merge Request'
-  end
-
-  step 'I should not see "Snippets" button' do
-    page.within '.content' do
-      expect(page).not_to have_link 'Snippets'
-    end
-  end
-
-  step 'project "Shop" belongs to group' do
-    group = create(:group)
-    @project.namespace = group
-    @project.save!
-  end
-
-  step 'I click notifications drop down button' do
-    first('.notifications-btn').click
-  end
-
-  step 'I choose Mention setting' do
-    click_link 'On mention'
-  end
-
-  step 'I should see Notification saved message' do
-    page.within '#notifications-button' do
-      expect(page).to have_content 'On mention'
-    end
-  end
-
-  step 'I create bare repo' do
-    click_link 'Create empty repository'
-  end
-
-  step 'I should see command line instructions' do
-    page.within ".empty_wrapper" do
-      expect(page).to have_content("Command line instructions")
-    end
-  end
-end
diff --git a/features/steps/shared/project.rb b/features/steps/shared/project.rb
index be848ebafa08bc576594ac366ce907cfcdad5cc0..09969a6473ffab15bc5fbb5a71eb709fea1b8453 100644
--- a/features/steps/shared/project.rb
+++ b/features/steps/shared/project.rb
@@ -25,72 +25,6 @@ module SharedProject
     @project.add_master(@user)
   end
 
-  step 'I disable snippets in project' do
-    @project.snippets_enabled = false
-    @project.save
-  end
-
-  step 'I disable issues and merge requests in project' do
-    @project.issues_enabled = false
-    @project.merge_requests_enabled = false
-    @project.save
-  end
-
-  # Add another user to project "Shop"
-  step 'I add a user to project "Shop"' do
-    @project = Project.find_by(name: "Shop")
-    other_user = create(:user, name: 'Alpha')
-    @project.add_master(other_user)
-  end
-
-  # Create another specific project called "Forum"
-  step 'I own project "Forum"' do
-    @project = Project.find_by(name: "Forum")
-    @project ||= create(:project, :repository, name: "Forum", namespace: @user.namespace, path: 'forum_project')
-    @project.build_project_feature
-    @project.project_feature.save
-    @project.add_master(@user)
-  end
-
-  # Create an empty project without caring about the name
-  step 'I own an empty project' do
-    @project = create(:project, name: 'Empty Project', namespace: @user.namespace)
-    @project.add_master(@user)
-  end
-
-  step 'I visit my empty project page' do
-    project = Project.find_by(name: 'Empty Project')
-    visit project_path(project)
-  end
-
-  step 'I visit project "Shop" activity page' do
-    project = Project.find_by(name: 'Shop')
-    visit project_path(project)
-  end
-
-  step 'project "Shop" has push event' do
-    @project = Project.find_by(name: "Shop")
-    @event = create(:push_event, project: @project, author: @user)
-
-    create(:push_event_payload,
-           event: @event,
-           action: :created,
-           commit_to: '6d394385cf567f80a8fd85055db1ab4c5295806f',
-           ref: 'fix',
-           commit_count: 1)
-  end
-
-  step 'I should see project "Shop" activity feed' do
-    project = Project.find_by(name: "Shop")
-    expect(page).to have_content "#{@user.name} pushed new branch fix at #{project.full_name}"
-  end
-
-  step 'I should see project settings' do
-    expect(current_path).to eq edit_project_path(@project)
-    expect(page).to have_content("Project name")
-    expect(page).to have_content("Permissions")
-  end
-
   def current_project
     @project ||= Project.first
   end
@@ -206,24 +140,6 @@ module SharedProject
     create(:label, project: project, title: 'enhancement')
   end
 
-  step 'project "Shop" has CI enabled' do
-    project = Project.find_by(name: "Shop")
-    project.enable_ci
-  end
-
-  step 'project "Shop" has CI build' do
-    project = Project.find_by(name: "Shop")
-    pipeline = create :ci_pipeline, project: project, sha: project.commit.sha, ref: 'master'
-    pipeline.skip
-  end
-
-  step 'I should see last commit with CI status' do
-    page.within ".blob-commit-info" do
-      expect(page).to have_content(project.commit.sha[0..6])
-      expect(page).to have_link("Commit: skipped")
-    end
-  end
-
   step 'The project is internal' do
     @project.update(visibility_level: Gitlab::VisibilityLevel::INTERNAL)
   end
diff --git a/spec/features/projects/activity/rss_spec.rb b/spec/features/projects/activity/rss_spec.rb
index 2693e5392681ed4544393eb1712eb4e515b1e30c..cd1cfe0799864efe274c0e9a100eb9bbe448af28 100644
--- a/spec/features/projects/activity/rss_spec.rb
+++ b/spec/features/projects/activity/rss_spec.rb
@@ -1,8 +1,8 @@
 require 'spec_helper'
 
 feature 'Project Activity RSS' do
-  let(:user) { create(:user) }
-  let(:project) { create(:project, visibility_level: Gitlab::VisibilityLevel::PUBLIC) }
+  let(:project) { create(:project, :public) }
+  let(:user) { project.owner }
   let(:path) { activity_project_path(project) }
 
   before do
@@ -11,8 +11,7 @@ feature 'Project Activity RSS' do
 
   context 'when signed in' do
     before do
-      project.add_developer(user)
-      sign_in(user)
+      sign_in(project.owner)
       visit path
     end
 
diff --git a/spec/features/projects/activity/user_sees_activity_spec.rb b/spec/features/projects/activity/user_sees_activity_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..644a837dc1455d2bcacb1b8671d2e9687c71ddd4
--- /dev/null
+++ b/spec/features/projects/activity/user_sees_activity_spec.rb
@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+feature 'Projects > Activity > User sees activity' do
+  let(:project) { create(:project, :repository, :public) }
+  let(:user) { project.creator }
+
+  before do
+    event = create(:push_event, project: project, author: user)
+    create(:push_event_payload,
+           event: event,
+           action: :created,
+           commit_to: '6d394385cf567f80a8fd85055db1ab4c5295806f',
+           ref: 'fix',
+           commit_count: 1)
+    visit activity_project_path(project)
+  end
+
+  it 'shows the last push in the activity page', :js do
+    expect(page).to have_content "#{user.name} pushed new branch fix"
+  end
+end
diff --git a/spec/features/projects/edit_spec.rb b/spec/features/projects/edit_spec.rb
deleted file mode 100644
index 1d4b4d0fdca6206efb7a6258b6b7979fc8ec990e..0000000000000000000000000000000000000000
--- a/spec/features/projects/edit_spec.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-require 'rails_helper'
-
-feature 'Project edit', :js do
-  let(:admin)   { create(:admin) }
-  let(:user)    { create(:user) }
-  let(:project) { create(:project) }
-
-  context 'feature visibility' do
-    before do
-      project.add_master(user)
-      sign_in(user)
-
-      visit edit_project_path(project)
-    end
-
-    context 'merge requests select' do
-      it 'hides merge requests section' do
-        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
-
-      context 'given project with merge_requests_disabled access level' do
-        let(:project) { create(:project, :merge_requests_disabled) }
-
-        it 'hides merge requests section' do
-          expect(page).to have_selector('.merge-requests-feature', visible: false)
-        end
-      end
-    end
-
-    context 'builds select' do
-      it 'hides builds select section' do
-        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
-
-      context 'given project with builds_disabled access level' do
-        let(:project) { create(:project, :builds_disabled) }
-
-        it 'hides builds select section' do
-          expect(page).to have_selector('.builds-feature', visible: false)
-        end
-      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/files/browse_files_spec.rb b/spec/features/projects/files/browse_files_spec.rb
deleted file mode 100644
index 2c38c380d9d53b264c885f7416f034e04cc87b1e..0000000000000000000000000000000000000000
--- a/spec/features/projects/files/browse_files_spec.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-require 'spec_helper'
-
-feature 'user browses project', :js do
-  let(:project) { create(:project, :repository) }
-  let(:user) { create(:user) }
-
-  before do
-    project.add_master(user)
-    sign_in(user)
-    visit project_tree_path(project, project.default_branch)
-  end
-
-  scenario "can see blame of '.gitignore'" do
-    click_link ".gitignore"
-    click_link 'Blame'
-
-    expect(page).to have_content "*.rb"
-    expect(page).to have_content "Dmitriy Zaporozhets"
-    expect(page).to have_content "Initial commit"
-  end
-
-  scenario 'can see raw content of LFS pointer with LFS disabled' do
-    allow_any_instance_of(Project).to receive(:lfs_enabled?).and_return(false)
-    click_link 'files'
-    click_link 'lfs'
-    click_link 'lfs_object.iso'
-    wait_for_requests
-
-    expect(page).not_to have_content 'Download (1.5 MB)'
-    expect(page).to have_content 'version https://git-lfs.github.com/spec/v1'
-    expect(page).to have_content 'oid sha256:91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897'
-    expect(page).to have_content 'size 1575078'
-  end
-
-  scenario 'can see last commit for current directory' do
-    last_commit = project.repository.last_commit_for_path(project.default_branch, 'files')
-
-    click_link 'files'
-    wait_for_requests
-
-    page.within('.blob-commit-info') do
-      expect(page).to have_content last_commit.short_id
-      expect(page).to have_content last_commit.author_name
-    end
-  end
-end
diff --git a/spec/features/projects/files/creating_a_file_spec.rb b/spec/features/projects/files/creating_a_file_spec.rb
deleted file mode 100644
index 8d982636525427d21710d83074b42db7808dba94..0000000000000000000000000000000000000000
--- a/spec/features/projects/files/creating_a_file_spec.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-require 'spec_helper'
-
-feature 'User wants to create a file' do
-  let(:project) { create(:project, :repository) }
-  let(:user) { create(:user) }
-
-  background do
-    project.add_master(user)
-    sign_in user
-    visit project_new_blob_path(project, project.default_branch)
-  end
-
-  def submit_new_file(options)
-    file_name = find('#file_name')
-    file_name.set options[:file_name] || 'README.md'
-
-    file_content = find('#file-content', visible: false)
-    file_content.set options[:file_content] || 'Some content'
-
-    click_button 'Commit changes'
-  end
-
-  scenario 'file name contains Chinese characters' do
-    submit_new_file(file_name: '测试.md')
-    expect(page).to have_content 'The file has been successfully created.'
-  end
-
-  scenario 'directory name contains Chinese characters' do
-    submit_new_file(file_name: '中文/测试.md')
-    expect(page).to have_content 'The file has been successfully created'
-  end
-
-  scenario 'file name contains directory traversal' do
-    submit_new_file(file_name: '../README.md')
-    expect(page).to have_content 'Path cannot include directory traversal'
-  end
-end
diff --git a/spec/features/projects/files/dockerfile_dropdown_spec.rb b/spec/features/projects/files/dockerfile_dropdown_spec.rb
index f4a39e331fd97423ecf9f8069641c535f09875ce..004585f7c9e0ea81f47860b536d145365a57989f 100644
--- a/spec/features/projects/files/dockerfile_dropdown_spec.rb
+++ b/spec/features/projects/files/dockerfile_dropdown_spec.rb
@@ -1,22 +1,15 @@
 require 'spec_helper'
-require 'fileutils'
 
-feature 'User wants to add a Dockerfile file' do
+describe 'Projects > Files > User wants to add a Dockerfile file' do
   before do
-    user = create(:user)
     project = create(:project, :repository)
-    project.add_master(user)
-
-    sign_in user
-
+    sign_in project.owner
     visit project_new_blob_path(project, 'master', file_name: 'Dockerfile')
   end
 
-  scenario 'user can see Dockerfile dropdown' do
+  it 'user can pick a Dockerfile file from the dropdown', :js do
     expect(page).to have_css('.dockerfile-selector')
-  end
 
-  scenario 'user can pick a Dockerfile file from the dropdown', :js do
     find('.js-dockerfile-selector').click
 
     wait_for_requests
diff --git a/spec/features/projects/files/download_buttons_spec.rb b/spec/features/projects/files/download_buttons_spec.rb
index 2101627f324b7e0d21fb561e1c4e11e58057f3af..03cb3530e2b671c719711e9ec2631b3e1213a34e 100644
--- a/spec/features/projects/files/download_buttons_spec.rb
+++ b/spec/features/projects/files/download_buttons_spec.rb
@@ -1,42 +1,36 @@
 require 'spec_helper'
 
-feature 'Download buttons in files tree' do
-  given(:user) { create(:user) }
-  given(:role) { :developer }
-  given(:status) { 'success' }
-  given(:project) { create(:project, :repository) }
+describe 'Projects > Files > Download buttons in files tree' do
+  let(:project) { create(:project, :repository) }
+  let(:user) { project.creator }
 
-  given(:pipeline) do
+  let(:pipeline) do
     create(:ci_pipeline,
            project: project,
            sha: project.commit.sha,
            ref: project.default_branch,
-           status: status)
+           status: 'success')
   end
 
-  given!(:build) do
+  let!(:build) do
     create(:ci_build, :success, :artifacts,
            pipeline: pipeline,
            status: pipeline.status,
            name: 'build')
   end
 
-  background do
+  before do
     sign_in(user)
-    project.add_role(user, role)
-  end
+    project.add_developer(user)
 
-  describe 'when files tree' do
-    context 'with artifacts' do
-      before do
-        visit project_tree_path(project, project.default_branch)
-      end
+    visit project_tree_path(project, project.default_branch)
+  end
 
-      scenario 'shows download artifacts button' do
-        href = latest_succeeded_project_artifacts_path(project, "#{project.default_branch}/download", job: 'build')
+  context 'with artifacts' do
+    it 'shows download artifacts button' do
+      href = latest_succeeded_project_artifacts_path(project, "#{project.default_branch}/download", job: 'build')
 
-        expect(page).to have_link "Download '#{build.name}'", href: href
-      end
+      expect(page).to have_link "Download '#{build.name}'", href: href
     end
   end
 end
diff --git a/spec/features/projects/files/edit_file_soft_wrap_spec.rb b/spec/features/projects/files/edit_file_soft_wrap_spec.rb
index 8d32ada57953ad49588db48f3a912865777aefd4..41af70d8ebc98bd4f03f2bc535279f84a31ae522 100644
--- a/spec/features/projects/files/edit_file_soft_wrap_spec.rb
+++ b/spec/features/projects/files/edit_file_soft_wrap_spec.rb
@@ -1,10 +1,9 @@
 require 'spec_helper'
 
-feature 'User uses soft wrap whilst editing file', :js do
+describe 'Projects > Files > User uses soft wrap whilst editing file', :js do
   before do
-    user = create(:user)
     project = create(:project, :repository)
-    project.add_master(user)
+    user = project.owner
     sign_in user
     visit project_new_blob_path(project, 'master', file_name: 'test_file-name')
     page.within('.file-editor.code') do
@@ -23,7 +22,7 @@ feature 'User uses soft wrap whilst editing file', :js do
 
   let(:toggle_button) { find('.soft-wrap-toggle') }
 
-  scenario 'user clicks the "Soft wrap" button and then "No wrap" button' do
+  it 'user clicks the "Soft wrap" button and then "No wrap" button' do
     wrapped_content_width = get_content_width
     toggle_button.click
     expect(toggle_button).to have_content 'No wrap'
diff --git a/spec/features/projects/files/editing_a_file_spec.rb b/spec/features/projects/files/editing_a_file_spec.rb
index d874cdbff8dc892d9d792724bf3e855d371021d6..4074e67e2d24a5c394aeacbc539fb3097a65dfc6 100644
--- a/spec/features/projects/files/editing_a_file_spec.rb
+++ b/spec/features/projects/files/editing_a_file_spec.rb
@@ -1,8 +1,8 @@
 require 'spec_helper'
 
-feature 'User wants to edit a file' do
+describe 'Projects > Files > User wants to edit a file' do
   let(:project) { create(:project, :repository) }
-  let(:user) { create(:user) }
+  let(:user) { project.owner }
   let(:commit_params) do
     {
       start_branch: project.default_branch,
@@ -15,14 +15,13 @@ feature 'User wants to edit a file' do
     }
   end
 
-  background do
-    project.add_master(user)
+  before do
     sign_in user
     visit project_edit_blob_path(project,
                                            File.join(project.default_branch, '.gitignore'))
   end
 
-  scenario 'file has been updated since the user opened the edit page' do
+  it 'file has been updated since the user opened the edit page' do
     Files::UpdateService.new(project, user, commit_params).execute
 
     click_button 'Commit changes'
diff --git a/spec/features/projects/files/files_sort_submodules_with_folders_spec.rb b/spec/features/projects/files/files_sort_submodules_with_folders_spec.rb
index ead9f7e91685da6ba6b492a81b6780ad9374c1df..b6dbf76bc9b19abc87a04a7db9588869750d6187 100644
--- a/spec/features/projects/files/files_sort_submodules_with_folders_spec.rb
+++ b/spec/features/projects/files/files_sort_submodules_with_folders_spec.rb
@@ -1,16 +1,15 @@
 require 'spec_helper'
 
-feature 'User views files page' do
-  let(:user) { create(:user) }
+describe 'Projects > Files > User views files page' do
   let(:project) { create(:forked_project_with_submodules) }
+  let(:user) { project.owner }
 
   before do
-    project.add_master(user)
     sign_in user
     visit project_tree_path(project, project.repository.root_ref)
   end
 
-  scenario 'user sees folders and submodules sorted together, followed by files' do
+  it 'user sees folders and submodules sorted together, followed by files' do
     rows = all('td.tree-item-file-name').map(&:text)
     tree = project.repository.tree
 
diff --git a/spec/features/projects/files/find_file_keyboard_spec.rb b/spec/features/projects/files/find_file_keyboard_spec.rb
index e9ff06c72d8b88b95a5529b5b5caf77ceaa3b758..cd0235f2b9e412f023283bbf636d93fe8e4d5313 100644
--- a/spec/features/projects/files/find_file_keyboard_spec.rb
+++ b/spec/features/projects/files/find_file_keyboard_spec.rb
@@ -1,11 +1,10 @@
 require 'spec_helper'
 
-feature 'Find file keyboard shortcuts', :js do
-  let(:user) { create(:user) }
+describe 'Projects > Files > Find file keyboard shortcuts', :js do
   let(:project) { create(:project, :repository) }
+  let(:user) { project.owner }
 
   before do
-    project.add_master(user)
     sign_in user
 
     visit project_find_file_path(project, project.repository.root_ref)
diff --git a/spec/features/projects/files/gitignore_dropdown_spec.rb b/spec/features/projects/files/gitignore_dropdown_spec.rb
index 79f3fd09b481fdfd2eb0fff71c90f97335b8f7e5..9fa4c053a4010b3d2f1ae3f3c125e989d32039fc 100644
--- a/spec/features/projects/files/gitignore_dropdown_spec.rb
+++ b/spec/features/projects/files/gitignore_dropdown_spec.rb
@@ -1,25 +1,24 @@
 require 'spec_helper'
 
-feature 'User wants to add a .gitignore file' do
+describe 'Projects > Files > User wants to add a .gitignore file' do
   before do
-    user = create(:user)
     project = create(:project, :repository)
-    project.add_master(user)
-    sign_in user
+    sign_in project.owner
     visit project_new_blob_path(project, 'master', file_name: '.gitignore')
   end
 
-  scenario 'user can see .gitignore dropdown' do
+  it 'user can pick a .gitignore file from the dropdown', :js do
     expect(page).to have_css('.gitignore-selector')
-  end
 
-  scenario 'user can pick a .gitignore file from the dropdown', :js do
     find('.js-gitignore-selector').click
+
     wait_for_requests
+
     within '.gitignore-selector' do
       find('.dropdown-input-field').set('rails')
       find('.dropdown-content li', text: 'Rails').click
     end
+
     wait_for_requests
 
     expect(page).to have_css('.gitignore-selector .dropdown-toggle-text', text: 'Rails')
diff --git a/spec/features/projects/files/gitlab_ci_yml_dropdown_spec.rb b/spec/features/projects/files/gitlab_ci_yml_dropdown_spec.rb
index db6c67b802e6122599ff9290f61789d23687d6a3..53aff183562a5607ed9e0834463de86c98c1c0a2 100644
--- a/spec/features/projects/files/gitlab_ci_yml_dropdown_spec.rb
+++ b/spec/features/projects/files/gitlab_ci_yml_dropdown_spec.rb
@@ -1,25 +1,24 @@
 require 'spec_helper'
 
-feature 'User wants to add a .gitlab-ci.yml file' do
+describe 'Projects > Files > User wants to add a .gitlab-ci.yml file' do
   before do
-    user = create(:user)
     project = create(:project, :repository)
-    project.add_master(user)
-    sign_in user
+    sign_in project.owner
     visit project_new_blob_path(project, 'master', file_name: '.gitlab-ci.yml')
   end
 
-  scenario 'user can see .gitlab-ci.yml dropdown' do
+  it 'user can pick a template from the dropdown', :js do
     expect(page).to have_css('.gitlab-ci-yml-selector')
-  end
 
-  scenario 'user can pick a template from the dropdown', :js do
     find('.js-gitlab-ci-yml-selector').click
+
     wait_for_requests
+
     within '.gitlab-ci-yml-selector' do
       find('.dropdown-input-field').set('Jekyll')
       find('.dropdown-content li', text: 'Jekyll').click
     end
+
     wait_for_requests
 
     expect(page).to have_css('.gitlab-ci-yml-selector .dropdown-toggle-text', text: 'Jekyll')
diff --git a/spec/features/projects/files/project_owner_creates_license_file_spec.rb b/spec/features/projects/files/project_owner_creates_license_file_spec.rb
index 07599600876a32c5f3280a9bca6995d7b509129b..b410199fd1fc3338fe4d4387f7150a17ce4dc57c 100644
--- a/spec/features/projects/files/project_owner_creates_license_file_spec.rb
+++ b/spec/features/projects/files/project_owner_creates_license_file_spec.rb
@@ -1,17 +1,17 @@
 require 'spec_helper'
 
-feature 'project owner creates a license file', :js do
-  let(:project_master) { create(:user) }
+describe 'Projects > Files > Project owner creates a license file', :js do
   let(:project) { create(:project, :repository) }
-  background do
+  let(:project_master) { project.owner }
+
+  before do
     project.repository.delete_file(project_master, 'LICENSE',
       message: 'Remove LICENSE', branch_name: 'master')
-    project.add_master(project_master)
     sign_in(project_master)
     visit project_path(project)
   end
 
-  scenario 'project master creates a license file manually from a template' do
+  it 'project master creates a license file manually from a template' do
     visit project_tree_path(project, project.repository.root_ref)
     find('.add-to-tree').click
     click_link 'New file'
@@ -35,7 +35,7 @@ feature 'project owner creates a license file', :js do
     expect(page).to have_content("Copyright (c) #{Time.now.year} #{project.namespace.human_name}")
   end
 
-  scenario 'project master creates a license file from the "Add license" link' do
+  it 'project master creates a license file from the "Add license" link' do
     click_link 'Add License'
 
     expect(page).to have_content('New file')
diff --git a/spec/features/projects/files/project_owner_sees_link_to_create_license_file_in_empty_project_spec.rb b/spec/features/projects/files/project_owner_sees_link_to_create_license_file_in_empty_project_spec.rb
index 7f1d19341037ccebca0a4652c0611a5dc0644dc5..53d8ace7c946a6598ea8331a9a3655e0db5562b9 100644
--- a/spec/features/projects/files/project_owner_sees_link_to_create_license_file_in_empty_project_spec.rb
+++ b/spec/features/projects/files/project_owner_sees_link_to_create_license_file_in_empty_project_spec.rb
@@ -1,15 +1,14 @@
 require 'spec_helper'
 
-feature 'project owner sees a link to create a license file in empty project', :js do
-  let(:project_master) { create(:user) }
+describe 'Projects > Files > Project owner sees a link to create a license file in empty project', :js do
   let(:project) { create(:project_empty_repo) }
+  let(:project_master) { project.owner }
 
-  background do
-    project.add_master(project_master)
+  before do
     sign_in(project_master)
   end
 
-  scenario 'project master creates a license file from a template' do
+  it 'project master creates a license file from a template' do
     visit project_path(project)
     click_on 'Add License'
     expect(page).to have_content('New file')
diff --git a/spec/features/projects/files/template_type_dropdown_spec.rb b/spec/features/projects/files/template_type_dropdown_spec.rb
index 97408a9c41ec48aa04dc307f4b3203c07ad3c106..342a93b328f8f7ccb777e41201aca19cd31c8634 100644
--- a/spec/features/projects/files/template_type_dropdown_spec.rb
+++ b/spec/features/projects/files/template_type_dropdown_spec.rb
@@ -1,11 +1,10 @@
 require 'spec_helper'
 
-feature 'Template type dropdown selector', :js do
+describe 'Projects > Files > Template type dropdown selector', :js do
   let(:project) { create(:project, :repository) }
-  let(:user) { create(:user) }
+  let(:user) { project.owner }
 
   before do
-    project.add_master(user)
     sign_in user
   end
 
@@ -14,16 +13,16 @@ feature 'Template type dropdown selector', :js do
       create_and_edit_file('.random-file.js')
     end
 
-    scenario 'not displayed' do
+    it 'not displayed' do
       check_type_selector_display(false)
     end
 
-    scenario 'selects every template type correctly' do
+    it 'selects every template type correctly' do
       fill_in 'file_path', with: '.gitignore'
       try_selecting_all_types
     end
 
-    scenario 'updates toggle value when input matches' do
+    it 'updates toggle value when input matches' do
       fill_in 'file_path', with: '.gitignore'
       check_type_selector_toggle_text('.gitignore')
     end
@@ -34,15 +33,15 @@ feature 'Template type dropdown selector', :js do
       visit project_edit_blob_path(project, File.join(project.default_branch, 'LICENSE'))
     end
 
-    scenario 'displayed' do
+    it 'displayed' do
       check_type_selector_display(true)
     end
 
-    scenario 'is displayed when input matches' do
+    it 'is displayed when input matches' do
       check_type_selector_display(true)
     end
 
-    scenario 'selects every template type correctly' do
+    it 'selects every template type correctly' do
       try_selecting_all_types
     end
 
@@ -51,7 +50,7 @@ feature 'Template type dropdown selector', :js do
         click_link 'Preview changes'
       end
 
-      scenario 'type selector is hidden and shown correctly' do
+      it 'type selector is hidden and shown correctly' do
         check_type_selector_display(false)
         click_link 'Write'
         check_type_selector_display(true)
@@ -64,15 +63,15 @@ feature 'Template type dropdown selector', :js do
       visit project_new_blob_path(project, 'master', file_name: '.gitignore')
     end
 
-    scenario 'is displayed' do
+    it 'is displayed' do
       check_type_selector_display(true)
     end
 
-    scenario 'toggle is set to the correct value' do
+    it 'toggle is set to the correct value' do
       check_type_selector_toggle_text('.gitignore')
     end
 
-    scenario 'selects every template type correctly' do
+    it 'selects every template type correctly' do
       try_selecting_all_types
     end
   end
@@ -82,15 +81,15 @@ feature 'Template type dropdown selector', :js do
       visit project_new_blob_path(project, project.default_branch)
     end
 
-    scenario 'type selector is shown' do
+    it 'type selector is shown' do
       check_type_selector_display(true)
     end
 
-    scenario 'toggle is set to the proper value' do
+    it 'toggle is set to the proper value' do
       check_type_selector_toggle_text('Choose type')
     end
 
-    scenario 'selects every template type correctly' do
+    it 'selects every template type correctly' do
       try_selecting_all_types
     end
   end
diff --git a/spec/features/projects/files/undo_template_spec.rb b/spec/features/projects/files/undo_template_spec.rb
index fbf35fb4e1c3a20f2a99ca098457b5f6e13e5062..5de0bc009fbde6a0ea7b51e7cd2a9121a91b46ab 100644
--- a/spec/features/projects/files/undo_template_spec.rb
+++ b/spec/features/projects/files/undo_template_spec.rb
@@ -1,11 +1,10 @@
 require 'spec_helper'
 
-feature 'Template Undo Button', :js do
+describe 'Projects > Files > Template Undo Button', :js do
   let(:project) { create(:project, :repository) }
-  let(:user) { create(:user) }
+  let(:user) { project.owner }
 
   before do
-    project.add_master(user)
     sign_in user
   end
 
@@ -15,7 +14,7 @@ feature 'Template Undo Button', :js do
       select_file_template('.js-license-selector', 'Apache License 2.0')
     end
 
-    scenario 'reverts template application' do
+    it 'reverts template application' do
       try_template_undo('http://www.apache.org/licenses/', 'Apply a license template')
     end
   end
@@ -27,7 +26,7 @@ feature 'Template Undo Button', :js do
       select_file_template('.js-license-selector', 'Apache License 2.0')
     end
 
-    scenario 'reverts template application' do
+    it 'reverts template application' do
       try_template_undo('http://www.apache.org/licenses/', 'Apply a license template')
     end
   end
diff --git a/spec/features/projects/user_browses_a_tree_with_a_folder_containing_only_a_folder.rb b/spec/features/projects/files/user_browses_a_tree_with_a_folder_containing_only_a_folder.rb
similarity index 83%
rename from spec/features/projects/user_browses_a_tree_with_a_folder_containing_only_a_folder.rb
rename to spec/features/projects/files/user_browses_a_tree_with_a_folder_containing_only_a_folder.rb
index a17e65cc5b9fdf1dd26515c252bf469dd1a67a2c..2d67837763c80acae9a2b1266bc4609f03340384 100644
--- a/spec/features/projects/user_browses_a_tree_with_a_folder_containing_only_a_folder.rb
+++ b/spec/features/projects/files/user_browses_a_tree_with_a_folder_containing_only_a_folder.rb
@@ -1,9 +1,9 @@
 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
+describe 'Projects > Files > User browses a tree with a folder containing only a folder' do
   let(:project) { create(:project, :empty_repo) }
-  let(:user) { project.creator }
+  let(:user) { project.owner }
 
   before do
     # We need to disable the tree.flat_path provided by Gitaly to reproduce the issue
diff --git a/spec/features/projects/user_browses_files_spec.rb b/spec/features/projects/files/user_browses_files_spec.rb
similarity index 66%
rename from spec/features/projects/user_browses_files_spec.rb
rename to spec/features/projects/files/user_browses_files_spec.rb
index 62e6419cc423b46e9a90aa4c2ca9ce0c1e0c8350..9c1f11f4c12af7c7d0a38fe0a8801ff74eaa7176 100644
--- a/spec/features/projects/user_browses_files_spec.rb
+++ b/spec/features/projects/files/user_browses_files_spec.rb
@@ -1,8 +1,6 @@
 require 'spec_helper'
 
-describe 'User browses files' do
-  include DropzoneHelper
-
+describe 'Projects > Files > User browses files' do
   let(:fork_message) do
     "You're not allowed to make changes to this project directly. "\
     "A fork of this project has been created that you can make changes in, so you can submit a merge request."
@@ -12,13 +10,24 @@ describe 'User browses files' do
   let(:project2_tree_path_root_ref) { project_tree_path(project2, project2.repository.root_ref) }
   let(:tree_path_ref_6d39438) { project_tree_path(project, '6d39438') }
   let(:tree_path_root_ref) { project_tree_path(project, project.repository.root_ref) }
-  let(:user) { create(:user) }
+  let(:user) { project.owner }
 
   before do
-    project.add_master(user)
     sign_in(user)
   end
 
+  it 'shows last commit for current directory' do
+    visit(tree_path_root_ref)
+
+    click_link 'files'
+
+    last_commit = project.repository.last_commit_for_path(project.default_branch, 'files')
+    page.within('.blob-commit-info') do
+      expect(page).to have_content last_commit.short_id
+      expect(page).to have_content last_commit.author_name
+    end
+  end
+
   context 'when browsing the master branch' do
     before do
       visit(tree_path_root_ref)
@@ -48,7 +57,7 @@ describe 'User browses files' do
       expect(page).not_to have_link('Browse Files')
     end
 
-    it 'shows the "Browse Code" link' do
+    it 'shows the "Browse Files" link' do
       click_link('History')
 
       expect(page).to have_link('Browse Files')
@@ -121,6 +130,14 @@ describe 'User browses files' do
       wait_for_requests
       expect(page).to have_content('*.rbc')
     end
+
+    it 'is possible to blame' do
+      click_link 'Blame'
+
+      expect(page).to have_content "*.rb"
+      expect(page).to have_content "Dmitriy Zaporozhets"
+      expect(page).to have_content "Initial commit"
+    end
   end
 
   context 'when browsing a raw file' do
@@ -133,57 +150,4 @@ describe 'User browses files' do
       expect(source).to eq('') # Body is filled in by gitlab-workhorse
     end
   end
-
-  context 'when browsing an LFS object' do
-    before do
-      allow_any_instance_of(Project).to receive(:lfs_enabled?).and_return(true)
-      visit(project_tree_path(project, 'lfs'))
-    end
-
-    it 'shows an LFS object' do
-      click_link('files')
-      click_link('lfs')
-      click_link('lfs_object.iso')
-
-      expect(page).to have_content('Download (1.5 MB)')
-      expect(page).not_to have_content('version https://git-lfs.github.com/spec/v1')
-      expect(page).not_to have_content('oid sha256:91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897')
-      expect(page).not_to have_content('size 1575078')
-
-      page.within('.content') do
-        expect(page).to have_content('Delete')
-        expect(page).to have_content('History')
-        expect(page).to have_content('Permalink')
-        expect(page).to have_content('Replace')
-        expect(page).not_to have_content('Annotate')
-        expect(page).not_to have_content('Blame')
-        expect(page).not_to have_content('Edit')
-        expect(page).to have_link('Download')
-      end
-    end
-  end
-
-  context 'when previewing a file content' do
-    before do
-      visit(tree_path_root_ref)
-    end
-
-    it 'shows a preview of a file content', :js do
-      find('.add-to-tree').click
-      click_link('Upload file')
-      drop_in_dropzone(File.join(Rails.root, 'spec', 'fixtures', 'logo_sample.svg'))
-
-      page.within('#modal-upload-blob') do
-        fill_in(:commit_message, with: 'New commit message')
-        fill_in(:branch_name, with: 'new_branch_name', visible: true)
-        click_button('Upload file')
-      end
-
-      wait_for_all_requests
-
-      visit(project_blob_path(project, 'new_branch_name/logo_sample.svg'))
-
-      expect(page).to have_css('.file-content img')
-    end
-  end
 end
diff --git a/spec/features/projects/files/user_browses_lfs_files_spec.rb b/spec/features/projects/files/user_browses_lfs_files_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..c559a301ca1c6883a1c1bba96a816d71f309f6e0
--- /dev/null
+++ b/spec/features/projects/files/user_browses_lfs_files_spec.rb
@@ -0,0 +1,57 @@
+require 'spec_helper'
+
+describe 'Projects > Files > User browses LFS files' do
+  let(:project) { create(:project, :repository) }
+  let(:user) { project.owner }
+
+  before do
+    sign_in(user)
+  end
+
+  context 'when LFS is disabled', :js do
+    before do
+      allow_any_instance_of(Project).to receive(:lfs_enabled?).and_return(false)
+      visit project_tree_path(project, 'lfs')
+    end
+
+    it 'is possible to see raw content of LFS pointer' do
+      click_link 'files'
+      click_link 'lfs'
+      click_link 'lfs_object.iso'
+
+      expect(page).to have_content 'version https://git-lfs.github.com/spec/v1'
+      expect(page).to have_content 'oid sha256:91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897'
+      expect(page).to have_content 'size 1575078'
+      expect(page).not_to have_content 'Download (1.5 MB)'
+    end
+  end
+
+  context 'when LFS is enabled' do
+    before do
+      allow_any_instance_of(Project).to receive(:lfs_enabled?).and_return(true)
+      visit project_tree_path(project, 'lfs')
+    end
+
+    it 'shows an LFS object' do
+      click_link('files')
+      click_link('lfs')
+      click_link('lfs_object.iso')
+
+      expect(page).to have_content('Download (1.5 MB)')
+      expect(page).not_to have_content('version https://git-lfs.github.com/spec/v1')
+      expect(page).not_to have_content('oid sha256:91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897')
+      expect(page).not_to have_content('size 1575078')
+
+      page.within('.content') do
+        expect(page).to have_content('Delete')
+        expect(page).to have_content('History')
+        expect(page).to have_content('Permalink')
+        expect(page).to have_content('Replace')
+        expect(page).not_to have_content('Annotate')
+        expect(page).not_to have_content('Blame')
+        expect(page).not_to have_content('Edit')
+        expect(page).to have_link('Download')
+      end
+    end
+  end
+end
diff --git a/spec/features/projects/user_creates_directory_spec.rb b/spec/features/projects/files/user_creates_directory_spec.rb
similarity index 97%
rename from spec/features/projects/user_creates_directory_spec.rb
rename to spec/features/projects/files/user_creates_directory_spec.rb
index 00e48f6fabd22bc25e7f104f4f88a924acfa3d5a..847b5f0860f7fb65b500a3b8420a3c454a760c8e 100644
--- a/spec/features/projects/user_creates_directory_spec.rb
+++ b/spec/features/projects/files/user_creates_directory_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-feature 'User creates a directory', :js do
+describe 'Projects > Files > User creates a directory', :js do
   let(:fork_message) do
     "You're not allowed to make changes to this project directly. "\
     "A fork of this project has been created that you can make changes in, so you can submit a merge request."
diff --git a/spec/features/projects/user_creates_files_spec.rb b/spec/features/projects/files/user_creates_files_spec.rb
similarity index 84%
rename from spec/features/projects/user_creates_files_spec.rb
rename to spec/features/projects/files/user_creates_files_spec.rb
index 8993533676b709493345d711d891ef2adf3003e3..208cc8d81f76eefa89c10732e1063b92554f4b1a 100644
--- a/spec/features/projects/user_creates_files_spec.rb
+++ b/spec/features/projects/files/user_creates_files_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'User creates files' do
+describe 'Projects > Files > User creates files' do
   let(:fork_message) do
     "You're not allowed to make changes to this project directly. "\
     "A fork of this project has been created that you can make changes in, so you can submit a merge request."
@@ -59,6 +59,31 @@ describe 'User creates files' do
         expect(page).to have_selector('.file-editor')
       end
 
+      def submit_new_file(options)
+        file_name = find('#file_name')
+        file_name.set options[:file_name] || 'README.md'
+
+        file_content = find('#file-content', visible: false)
+        file_content.set options[:file_content] || 'Some content'
+
+        click_button 'Commit changes'
+      end
+
+      it 'allows Chinese characters in file name' do
+        submit_new_file(file_name: '测试.md')
+        expect(page).to have_content 'The file has been successfully created.'
+      end
+
+      it 'allows Chinese characters in directory name' do
+        submit_new_file(file_name: '中文/测试.md')
+        expect(page).to have_content 'The file has been successfully created'
+      end
+
+      it 'does not allow directory traversal in file name' do
+        submit_new_file(file_name: '../README.md')
+        expect(page).to have_content 'Path cannot include directory traversal'
+      end
+
       it 'creates and commit a new file', :js do
         find('#editor')
         execute_script("ace.edit('editor').setValue('*.rbca')")
diff --git a/spec/features/projects/user_deletes_files_spec.rb b/spec/features/projects/files/user_deletes_files_spec.rb
similarity index 97%
rename from spec/features/projects/user_deletes_files_spec.rb
rename to spec/features/projects/files/user_deletes_files_spec.rb
index 9d55197e719b99c4fc3d6e2f2d2045761d8f1034..36d3e001a64e60a4d2f99bf1e68e4c0b45d6b763 100644
--- a/spec/features/projects/user_deletes_files_spec.rb
+++ b/spec/features/projects/files/user_deletes_files_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'User deletes files' do
+describe 'Projects > Files > User deletes files' do
   let(:fork_message) do
     "You're not allowed to make changes to this project directly. "\
     "A fork of this project has been created that you can make changes in, so you can submit a merge request."
diff --git a/spec/features/projects/user_edits_files_spec.rb b/spec/features/projects/files/user_edits_files_spec.rb
similarity index 99%
rename from spec/features/projects/user_edits_files_spec.rb
rename to spec/features/projects/files/user_edits_files_spec.rb
index 05c2be473da94aa4750f9d9bfa232a294c0585ef..523a9f3f4fe2f4de5eb4bc4db393f8b6895f4dae 100644
--- a/spec/features/projects/user_edits_files_spec.rb
+++ b/spec/features/projects/files/user_edits_files_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'User edits files' do
+describe 'Projects > Files > User edits files' do
   include ProjectForksHelper
   let(:project) { create(:project, :repository, name: 'Shop') }
   let(:project2) { create(:project, :repository, name: 'Another Project', path: 'another-project') }
diff --git a/spec/features/projects/user_replaces_files_spec.rb b/spec/features/projects/files/user_replaces_files_spec.rb
similarity index 98%
rename from spec/features/projects/user_replaces_files_spec.rb
rename to spec/features/projects/files/user_replaces_files_spec.rb
index 74872403b35fae729ea0027c76ab385c85721362..9ac3417b671d7be6eba2b9380bc715d6c54b0c2c 100644
--- a/spec/features/projects/user_replaces_files_spec.rb
+++ b/spec/features/projects/files/user_replaces_files_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'User replaces files' do
+describe 'Projects > Files > User replaces files' do
   include DropzoneHelper
 
   let(:fork_message) do
diff --git a/spec/features/projects/files/user_searches_for_files_spec.rb b/spec/features/projects/files/user_searches_for_files_spec.rb
index a105685bca7003a1701df5610e90c46b45cb2b69..a90e4918fb19e26665121b15d9d24ea1e6871342 100644
--- a/spec/features/projects/files/user_searches_for_files_spec.rb
+++ b/spec/features/projects/files/user_searches_for_files_spec.rb
@@ -1,8 +1,7 @@
 require 'spec_helper'
 
-describe 'User searches for files' do
-  let(:user) { create(:user) }
-  let(:project) { create(:project, :repository) }
+describe 'Projects > Files > User searches for files' do
+  let(:user) { project.owner }
 
   before do
     sign_in(user)
@@ -10,11 +9,10 @@ describe 'User searches for files' do
 
   describe 'project main screen' do
     context 'when project is empty' do
-      let(:empty_project) { create(:project) }
+      let(:project) { create(:project) }
 
       before do
-        empty_project.add_developer(user)
-        visit project_path(empty_project)
+        visit project_path(project)
       end
 
       it 'does not show any result' do
@@ -26,6 +24,8 @@ describe 'User searches for files' do
     end
 
     context 'when project is not empty' do
+      let(:project) { create(:project, :repository) }
+
       before do
         project.add_developer(user)
         visit project_path(project)
@@ -38,16 +38,16 @@ describe 'User searches for files' do
   end
 
   describe 'project tree screen' do
+    let(:project) { create(:project, :repository) }
+
     before do
       project.add_developer(user)
       visit project_tree_path(project, project.default_branch)
     end
 
-    it 'shows "Find file" button' do
+    it 'shows found files' do
       expect(page).to have_selector('.tree-controls .shortcuts-find-file')
-    end
 
-    it 'shows found files' do
       fill_in('search', with: 'coffee')
       click_button('Go')
 
diff --git a/spec/features/projects/user_uploads_files_spec.rb b/spec/features/projects/files/user_uploads_files_spec.rb
similarity index 78%
rename from spec/features/projects/user_uploads_files_spec.rb
rename to spec/features/projects/files/user_uploads_files_spec.rb
index 75898afcda946f55e6c685eac68d46f92212adce..7a1e3a8bcce24ba15506800bbe060dfc4ce3c2ad 100644
--- a/spec/features/projects/user_uploads_files_spec.rb
+++ b/spec/features/projects/files/user_uploads_files_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'User uploads files' do
+describe 'Projects > Files > User uploads files' do
   include DropzoneHelper
 
   let(:fork_message) do
@@ -11,7 +11,7 @@ describe 'User uploads files' do
   let(:project2) { create(:project, :repository, name: 'Another Project', path: 'another-project') }
   let(:project_tree_path_root_ref) { project_tree_path(project, project.repository.root_ref) }
   let(:project2_tree_path_root_ref) { project_tree_path(project2, project2.repository.root_ref) }
-  let(:user) { create(:user) }
+  let(:user) { project.creator }
 
   before do
     project.add_master(user)
@@ -23,7 +23,7 @@ describe 'User uploads files' do
       visit(project_tree_path_root_ref)
     end
 
-    it 'uploads and commit a new file', :js do
+    it 'uploads and commit a new text file', :js do
       find('.add-to-tree').click
       click_link('Upload file')
       drop_in_dropzone(File.join(Rails.root, 'spec', 'fixtures', 'doc_sample.txt'))
@@ -46,6 +46,24 @@ describe 'User uploads files' do
       expect(page).to have_content('Lorem ipsum dolor sit amet')
       expect(page).to have_content('Sed ut perspiciatis unde omnis')
     end
+
+    it 'uploads and commit a new image file', :js do
+      find('.add-to-tree').click
+      click_link('Upload file')
+      drop_in_dropzone(File.join(Rails.root, 'spec', 'fixtures', 'logo_sample.svg'))
+
+      page.within('#modal-upload-blob') do
+        fill_in(:commit_message, with: 'New commit message')
+        fill_in(:branch_name, with: 'new_branch_name', visible: true)
+        click_button('Upload file')
+      end
+
+      wait_for_all_requests
+
+      visit(project_blob_path(project, 'new_branch_name/logo_sample.svg'))
+
+      expect(page).to have_css('.file-content img')
+    end
   end
 
   context 'when an user does not have write access' do
diff --git a/spec/features/projects/guest_navigation_menu_spec.rb b/spec/features/projects/guest_navigation_menu_spec.rb
deleted file mode 100644
index 199682b943c256ee8ddcd8efaeabcaf4de0f730e..0000000000000000000000000000000000000000
--- a/spec/features/projects/guest_navigation_menu_spec.rb
+++ /dev/null
@@ -1,82 +0,0 @@
-require 'spec_helper'
-
-describe 'Guest navigation menu' do
-  let(:project) { create(:project, :private, public_builds: false) }
-  let(:guest) { create(:user) }
-
-  before do
-    project.add_guest(guest)
-
-    sign_in(guest)
-  end
-
-  it 'shows allowed tabs only' do
-    visit project_path(project)
-
-    within('.nav-sidebar') do
-      expect(page).to have_content 'Overview'
-      expect(page).to have_content 'Issues'
-      expect(page).to have_content 'Wiki'
-
-      expect(page).not_to have_content 'Repository'
-      expect(page).not_to have_content 'Pipelines'
-      expect(page).not_to have_content 'Merge Requests'
-    end
-  end
-
-  it 'does not show fork button' do
-    visit project_path(project)
-
-    within('.count-buttons') do
-      expect(page).not_to have_link 'Fork'
-    end
-  end
-
-  it 'does not show clone path' do
-    visit project_path(project)
-
-    within('.project-repo-buttons') do
-      expect(page).not_to have_selector '.project-clone-holder'
-    end
-  end
-
-  describe 'project landing page' do
-    before do
-      project.project_feature.update!(
-        issues_access_level: ProjectFeature::DISABLED,
-        wiki_access_level: ProjectFeature::DISABLED
-      )
-    end
-
-    it 'does not show the project file list landing page' do
-      visit project_path(project)
-
-      expect(page).not_to have_selector '.project-stats'
-      expect(page).not_to have_selector '.project-last-commit'
-      expect(page).not_to have_selector '.project-show-files'
-      expect(page).to have_selector '.project-show-customize_workflow'
-    end
-
-    it 'shows the customize workflow when issues and wiki are disabled' do
-      visit project_path(project)
-
-      expect(page).to have_selector '.project-show-customize_workflow'
-    end
-
-    it 'shows the wiki when enabled' do
-      project.project_feature.update!(wiki_access_level: ProjectFeature::PRIVATE)
-
-      visit project_path(project)
-
-      expect(page).to have_selector '.project-show-wiki'
-    end
-
-    it 'shows the issues when enabled' do
-      project.project_feature.update!(issues_access_level: ProjectFeature::PRIVATE)
-
-      visit project_path(project)
-
-      expect(page).to have_selector '.issues-list'
-    end
-  end
-end
diff --git a/spec/features/projects/project_settings_spec.rb b/spec/features/projects/project_settings_spec.rb
deleted file mode 100644
index a3ea778d401318422e1c4710518ec6c0e63497e6..0000000000000000000000000000000000000000
--- a/spec/features/projects/project_settings_spec.rb
+++ /dev/null
@@ -1,205 +0,0 @@
-require 'spec_helper'
-
-describe 'Edit Project Settings' do
-  include Select2Helper
-
-  let(:user) { create(:user) }
-  let(:project) { create(:project, namespace: user.namespace, path: 'gitlab', name: 'sample') }
-
-  before do
-    sign_in(user)
-  end
-
-  describe 'Project settings section', :js do
-    it 'shows errors for invalid project name' do
-      visit edit_project_path(project)
-      fill_in 'project_name_edit', with: 'foo&bar'
-      page.within('.general-settings') do
-        click_button 'Save changes'
-      end
-      expect(page).to have_field 'project_name_edit', with: 'foo&bar'
-      expect(page).to have_content "Name can contain only letters, digits, emojis, '_', '.', dash, space. It must start with letter, digit, emoji or '_'."
-      expect(page).to have_button 'Save changes'
-    end
-
-    it 'shows a successful notice when the project is updated' do
-      visit edit_project_path(project)
-      fill_in 'project_name_edit', with: 'hello world'
-      page.within('.general-settings') do
-        click_button 'Save changes'
-      end
-      expect(page).to have_content "Project 'hello world' was successfully updated."
-    end
-  end
-
-  describe 'Merge request settings section' do
-    it 'shows "Merge commit" strategy' do
-      visit edit_project_path(project)
-
-      page.within '.merge-requests-feature' do
-        expect(page).to have_content 'Merge commit'
-      end
-    end
-
-    it 'shows "Merge commit with semi-linear history " strategy' do
-      visit edit_project_path(project)
-
-      page.within '.merge-requests-feature' do
-        expect(page).to have_content 'Merge commit with semi-linear history'
-      end
-    end
-
-    it 'shows "Fast-forward merge" strategy' do
-      visit edit_project_path(project)
-
-      page.within '.merge-requests-feature' do
-        expect(page).to have_content 'Fast-forward merge'
-      end
-    end
-  end
-
-  describe 'Rename repository section' do
-    context 'with invalid characters' do
-      it 'shows errors for invalid project path/name' do
-        rename_project(project, name: 'foo&bar', path: 'foo&bar')
-        expect(page).to have_field 'Project name', with: 'foo&bar'
-        expect(page).to have_field 'Path', with: 'foo&bar'
-        expect(page).to have_content "Name can contain only letters, digits, emojis, '_', '.', dash, space. It must start with letter, digit, emoji or '_'."
-        expect(page).to have_content "Path can contain only letters, digits, '_', '-' and '.'. Cannot start with '-', end in '.git' or end in '.atom'"
-      end
-    end
-
-    context 'when changing project name' do
-      it 'renames the repository' do
-        rename_project(project, name: 'bar')
-        expect(find('.breadcrumbs')).to have_content(project.name)
-      end
-
-      context 'with emojis' do
-        it 'shows error for invalid project name' do
-          rename_project(project, name: '🚀 foo bar ☁️')
-          expect(page).to have_field 'Project name', with: '🚀 foo bar ☁️'
-          expect(page).not_to have_content "Name can contain only letters, digits, emojis '_', '.', dash and space. It must start with letter, digit, emoji or '_'."
-        end
-      end
-    end
-
-    context 'when changing project path' do
-      let(:project) { create(:project, :repository, namespace: user.namespace, name: 'gitlabhq') }
-
-      before(:context) do
-        TestEnv.clean_test_path
-      end
-
-      after do
-        TestEnv.clean_test_path
-      end
-
-      specify 'the project is accessible via the new path' do
-        rename_project(project, path: 'bar')
-        new_path = namespace_project_path(project.namespace, 'bar')
-        visit new_path
-        expect(current_path).to eq(new_path)
-        expect(find('.breadcrumbs')).to have_content(project.name)
-      end
-
-      specify 'the project is accessible via a redirect from the old path' do
-        old_path = project_path(project)
-        rename_project(project, path: 'bar')
-        new_path = namespace_project_path(project.namespace, 'bar')
-        visit old_path
-        expect(current_path).to eq(new_path)
-        expect(find('.breadcrumbs')).to have_content(project.name)
-      end
-
-      context 'and a new project is added with the same path' do
-        it 'overrides the redirect' do
-          old_path = project_path(project)
-          rename_project(project, path: 'bar')
-          new_project = create(:project, namespace: user.namespace, path: 'gitlabhq', name: 'quz')
-          visit old_path
-          expect(current_path).to eq(old_path)
-          expect(find('.breadcrumbs')).to have_content(new_project.name)
-        end
-      end
-    end
-  end
-
-  describe 'Transfer project section', :js do
-    let!(:project) { create(:project, :repository, namespace: user.namespace, name: 'gitlabhq') }
-    let!(:group) { create(:group) }
-
-    before(:context) do
-      TestEnv.clean_test_path
-    end
-
-    before do
-      group.add_owner(user)
-    end
-
-    after do
-      TestEnv.clean_test_path
-    end
-
-    specify 'the project is accessible via the new path' do
-      transfer_project(project, group)
-      new_path = namespace_project_path(group, project)
-
-      visit new_path
-      wait_for_requests
-
-      expect(current_path).to eq(new_path)
-      expect(find('.breadcrumbs')).to have_content(project.name)
-    end
-
-    specify 'the project is accessible via a redirect from the old path' do
-      old_path = project_path(project)
-      transfer_project(project, group)
-      new_path = namespace_project_path(group, project)
-
-      visit old_path
-      wait_for_requests
-
-      expect(current_path).to eq(new_path)
-      expect(find('.breadcrumbs')).to have_content(project.name)
-    end
-
-    context 'and a new project is added with the same path' do
-      it 'overrides the redirect' do
-        old_path = project_path(project)
-        transfer_project(project, group)
-        new_project = create(:project, namespace: user.namespace, path: 'gitlabhq', name: 'quz')
-        visit old_path
-        expect(current_path).to eq(old_path)
-        expect(find('.breadcrumbs')).to have_content(new_project.name)
-      end
-    end
-  end
-end
-
-def rename_project(project, name: nil, path: nil)
-  visit edit_project_path(project)
-  fill_in('project_name', with: name) if name
-  fill_in('Path', with: path) if path
-  click_button('Rename project')
-  wait_for_edit_project_page_reload
-  project.reload
-end
-
-def transfer_project(project, namespace)
-  visit edit_project_path(project)
-  select2(namespace.id, from: '#new_namespace_id')
-  click_button('Transfer project')
-  confirm_transfer_modal
-  wait_for_edit_project_page_reload
-  project.reload
-end
-
-def confirm_transfer_modal
-  fill_in('confirm_name_input', with: project.path)
-  click_button 'Confirm'
-end
-
-def wait_for_edit_project_page_reload
-  expect(find('.project-edit-container')).to have_content('Rename repository')
-end
diff --git a/spec/features/projects/settings/forked_project_settings_spec.rb b/spec/features/projects/settings/forked_project_settings_spec.rb
index 28954a4fb4022193d0b01cedd29aaf7f02a11bb9..a4d1b78b83b2eaba38026408cb447358c870fe91 100644
--- a/spec/features/projects/settings/forked_project_settings_spec.rb
+++ b/spec/features/projects/settings/forked_project_settings_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-feature 'Settings for a forked project', :js do
+describe 'Projects > Settings > For a forked project', :js do
   include ProjectForksHelper
   let(:user) { create(:user) }
   let(:original_project) { create(:project) }
diff --git a/spec/features/projects/settings/integration_settings_spec.rb b/spec/features/projects/settings/integration_settings_spec.rb
index f6a1a46df11e6f94ce36d5f7270c2dabfa0a44f5..5178d63050eb4b28427873f6a6939fd9a2987e67 100644
--- a/spec/features/projects/settings/integration_settings_spec.rb
+++ b/spec/features/projects/settings/integration_settings_spec.rb
@@ -1,20 +1,20 @@
 require 'spec_helper'
 
-feature 'Integration settings' do
+describe 'Projects > Settings > Integration settings' do
   let(:project) { create(:project) }
   let(:user) { create(:user) }
   let(:role) { :developer }
   let(:integrations_path) { project_settings_integrations_path(project) }
 
-  background do
+  before do
     sign_in(user)
     project.add_role(user, role)
   end
 
   context 'for developer' do
-    given(:role) { :developer }
+    let(:role) { :developer }
 
-    scenario 'to be disallowed to view' do
+    it 'to be disallowed to view' do
       visit integrations_path
 
       expect(page.status_code).to eq(404)
@@ -22,13 +22,13 @@ feature 'Integration settings' do
   end
 
   context 'for master' do
-    given(:role) { :master }
+    let(:role) { :master }
 
     context 'Webhooks' do
       let(:hook) { create(:project_hook, :all_events_enabled, enable_ssl_verification: true, project: project) }
       let(:url) { generate(:url) }
 
-      scenario 'show list of webhooks' do
+      it 'show list of webhooks' do
         hook
 
         visit integrations_path
@@ -46,7 +46,7 @@ feature 'Integration settings' do
         expect(page).to have_content('Wiki page events')
       end
 
-      scenario 'create webhook' do
+      it 'create webhook' do
         visit integrations_path
 
         fill_in 'hook_url', with: url
@@ -63,7 +63,7 @@ feature 'Integration settings' do
         expect(page).to have_content('Job events')
       end
 
-      scenario 'edit existing webhook' do
+      it 'edit existing webhook' do
         hook
         visit integrations_path
 
@@ -76,7 +76,7 @@ feature 'Integration settings' do
         expect(page).to have_content(url)
       end
 
-      scenario 'test existing webhook', :js do
+      it 'test existing webhook', :js do
         WebMock.stub_request(:post, hook.url)
         visit integrations_path
 
@@ -87,14 +87,14 @@ feature 'Integration settings' do
       end
 
       context 'remove existing webhook' do
-        scenario 'from webhooks list page' do
+        it 'from webhooks list page' do
           hook
           visit integrations_path
 
           expect { click_link 'Remove' }.to change(ProjectHook, :count).by(-1)
         end
 
-        scenario 'from webhook edit page' do
+        it 'from webhook edit page' do
           hook
           visit integrations_path
           click_link 'Edit'
@@ -108,7 +108,7 @@ feature 'Integration settings' do
       let(:hook) { create(:project_hook, project: project) }
       let(:hook_log) { create(:web_hook_log, web_hook: hook, internal_error_message: 'some error') }
 
-      scenario 'show list of hook logs' do
+      it 'show list of hook logs' do
         hook_log
         visit edit_project_hook_path(project, hook)
 
@@ -116,7 +116,7 @@ feature 'Integration settings' do
         expect(page).to have_content(hook_log.url)
       end
 
-      scenario 'show hook log details' do
+      it 'show hook log details' do
         hook_log
         visit edit_project_hook_path(project, hook)
         click_link 'View details'
@@ -126,7 +126,7 @@ feature 'Integration settings' do
         expect(page).to have_content('Resend Request')
       end
 
-      scenario 'retry hook log' do
+      it 'retry hook log' do
         WebMock.stub_request(:post, hook.url)
 
         hook_log
diff --git a/spec/features/projects/settings/lfs_settings_spec.rb b/spec/features/projects/settings/lfs_settings_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..0fd28a5681c9b5ef9f97855a246fb2d49ca6bc5e
--- /dev/null
+++ b/spec/features/projects/settings/lfs_settings_spec.rb
@@ -0,0 +1,21 @@
+require 'rails_helper'
+
+describe 'Projects > Settings > LFS settings' do
+  let(:admin) { create(:admin) }
+  let(:project) { create(:project) }
+
+  context 'LFS enabled setting' do
+    before do
+      allow(Gitlab.config.lfs).to receive(:enabled).and_return(true)
+
+      sign_in(admin)
+    end
+
+    it 'displays the correct elements', :js do
+      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/settings/pipelines_settings_spec.rb b/spec/features/projects/settings/pipelines_settings_spec.rb
index d07208555647b2708e8bd446f970be75d90dea2a..d9020333f289d23918eb85cf225886c59d7a84f1 100644
--- a/spec/features/projects/settings/pipelines_settings_spec.rb
+++ b/spec/features/projects/settings/pipelines_settings_spec.rb
@@ -1,19 +1,19 @@
 require 'spec_helper'
 
-feature "Pipelines settings" do
+describe "Projects > Settings > Pipelines settings" do
   let(:project) { create(:project) }
   let(:user) { create(:user) }
   let(:role) { :developer }
 
-  background do
+  before do
     sign_in(user)
     project.add_role(user, role)
   end
 
   context 'for developer' do
-    given(:role) { :developer }
+    let(:role) { :developer }
 
-    scenario 'to be disallowed to view' do
+    it 'to be disallowed to view' do
       visit project_settings_ci_cd_path(project)
 
       expect(page.status_code).to eq(404)
@@ -21,9 +21,9 @@ feature "Pipelines settings" do
   end
 
   context 'for master' do
-    given(:role) { :master }
+    let(:role) { :master }
 
-    scenario 'be allowed to change' do
+    it 'be allowed to change' do
       visit project_settings_ci_cd_path(project)
 
       fill_in('Test coverage parsing', with: 'coverage_regex')
@@ -34,7 +34,7 @@ feature "Pipelines settings" do
       expect(page).to have_field('Test coverage parsing', with: 'coverage_regex')
     end
 
-    scenario 'updates auto_cancel_pending_pipelines' do
+    it 'updates auto_cancel_pending_pipelines' do
       visit project_settings_ci_cd_path(project)
 
       page.check('Auto-cancel redundant, pending pipelines')
diff --git a/spec/features/projects/settings/repository_settings_spec.rb b/spec/features/projects/settings/repository_settings_spec.rb
index f2c371b7df5684fa935e7da94dc9abe7cdde154f..e1dfe617691f067958bbb0fd770589a988366bbe 100644
--- a/spec/features/projects/settings/repository_settings_spec.rb
+++ b/spec/features/projects/settings/repository_settings_spec.rb
@@ -1,19 +1,19 @@
 require 'spec_helper'
 
-feature 'Repository settings' do
+describe 'Projects > Settings > Repository settings' do
   let(:project) { create(:project_empty_repo) }
   let(:user) { create(:user) }
   let(:role) { :developer }
 
-  background do
+  before do
     project.add_role(user, role)
     sign_in(user)
   end
 
   context 'for developer' do
-    given(:role) { :developer }
+    let(:role) { :developer }
 
-    scenario 'is not allowed to view' do
+    it 'is not allowed to view' do
       visit project_settings_repository_path(project)
 
       expect(page.status_code).to eq(404)
@@ -21,14 +21,14 @@ feature 'Repository settings' do
   end
 
   context 'for master' do
-    given(:role) { :master }
+    let(:role) { :master }
 
     context 'Deploy Keys', :js do
       let(:private_deploy_key) { create(:deploy_key, title: 'private_deploy_key', public: false) }
       let(:public_deploy_key) { create(:another_deploy_key, title: 'public_deploy_key', public: true) }
       let(:new_ssh_key) { attributes_for(:key)[:key] }
 
-      scenario 'get list of keys' do
+      it 'get list of keys' do
         project.deploy_keys << private_deploy_key
         project.deploy_keys << public_deploy_key
 
@@ -38,7 +38,7 @@ feature 'Repository settings' do
         expect(page).to have_content('public_deploy_key')
       end
 
-      scenario 'add a new deploy key' do
+      it 'add a new deploy key' do
         visit project_settings_repository_path(project)
 
         fill_in 'deploy_key_title', with: 'new_deploy_key'
@@ -50,7 +50,7 @@ feature 'Repository settings' do
         expect(page).to have_content('Write access allowed')
       end
 
-      scenario 'edit an existing deploy key' do
+      it 'edit an existing deploy key' do
         project.deploy_keys << private_deploy_key
         visit project_settings_repository_path(project)
 
@@ -64,7 +64,7 @@ feature 'Repository settings' do
         expect(page).to have_content('Write access allowed')
       end
 
-      scenario 'edit a deploy key from projects user has access to' do
+      it 'edit a deploy key from projects user has access to' do
         project2 = create(:project_empty_repo)
         project2.add_role(user, role)
         project2.deploy_keys << private_deploy_key
@@ -79,7 +79,7 @@ feature 'Repository settings' do
         expect(page).to have_content('updated_deploy_key')
       end
 
-      scenario 'remove an existing deploy key' do
+      it 'remove an existing deploy key' do
         project.deploy_keys << private_deploy_key
         visit project_settings_repository_path(project)
 
diff --git a/spec/features/projects/user_archives_project_spec.rb b/spec/features/projects/settings/user_archives_project_spec.rb
similarity index 81%
rename from spec/features/projects/user_archives_project_spec.rb
rename to spec/features/projects/settings/user_archives_project_spec.rb
index 72063d13c2a2db8834b891c289f536f9342fe491..38c8a8c24682f1988e705cdd499e12cc79966b8b 100644
--- a/spec/features/projects/user_archives_project_spec.rb
+++ b/spec/features/projects/settings/user_archives_project_spec.rb
@@ -1,21 +1,19 @@
 require 'spec_helper'
 
-describe 'User archives a project' do
+describe 'Projects > Settings > User archives a project' do
   let(:user) { create(:user) }
 
   before do
     project.add_master(user)
 
     sign_in(user)
+
+    visit edit_project_path(project)
   end
 
   context 'when a project is archived' do
     let(:project) { create(:project, :archived, namespace: user.namespace) }
 
-    before do
-      visit(edit_project_path(project))
-    end
-
     it 'unarchives a project' do
       expect(page).to have_content('Unarchive project')
 
@@ -28,10 +26,6 @@ describe 'User archives a project' do
   context 'when a project is unarchived' do
     let(:project) { create(:project, :repository, namespace: user.namespace) }
 
-    before do
-      visit(edit_project_path(project))
-    end
-
     it 'archives a project' do
       expect(page).to have_content('Archive project')
 
diff --git a/spec/features/projects/settings/user_changes_avatar_spec.rb b/spec/features/projects/settings/user_changes_avatar_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..2dcc79d8a124b4e7436a1bc3e0ea3378375a45b0
--- /dev/null
+++ b/spec/features/projects/settings/user_changes_avatar_spec.rb
@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+describe 'Projects > Settings > User changes avatar' do
+  let(:project) { create(:project, :repository) }
+  let(:user) { project.creator }
+
+  before do
+    project.add_master(user)
+    sign_in(user)
+  end
+
+  it 'saves the new avatar' do
+    expect(project.reload.avatar.url).to be_nil
+
+    save_avatar(project)
+
+    expect(project.reload.avatar.url).to eq "/uploads/-/system/project/avatar/#{project.id}/banana_sample.gif"
+  end
+
+  context 'with an avatar already set' do
+    before do
+      save_avatar(project)
+    end
+
+    it 'is possible to remove the avatar' do
+      click_link 'Remove avatar'
+
+      expect(page).not_to have_link('Remove avatar')
+
+      expect(project.reload.avatar.url).to be_nil
+    end
+  end
+
+  def save_avatar(project)
+    visit edit_project_path(project)
+    attach_file(
+      :project_avatar,
+      File.join(Rails.root, 'spec', 'fixtures', 'banana_sample.gif')
+    )
+    page.within '.general-settings' do
+      click_button 'Save changes'
+    end
+  end
+end
diff --git a/spec/features/projects/settings/user_changes_default_branch_spec.rb b/spec/features/projects/settings/user_changes_default_branch_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..e925539351dbe6746d99f299c4b9f8634046eb26
--- /dev/null
+++ b/spec/features/projects/settings/user_changes_default_branch_spec.rb
@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe 'Projects > Settings > User changes default branch' do
+  let(:user) { create(:user) }
+  let(:project) { create(:project, :repository, namespace: user.namespace) }
+
+  before do
+    sign_in(user)
+    visit edit_project_path(project)
+  end
+
+  it 'allows to change the default branch' do
+    select 'fix', from: 'project_default_branch'
+    page.within '.general-settings' do
+      click_button 'Save changes'
+    end
+
+    expect(find(:css, 'select#project_default_branch').value).to eq 'fix'
+  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
index 91e8059865c873454e8d1ee7d3dc72fd74325357..fdf427970917effcf6400f3691dd4dd7f5320550 100644
--- a/spec/features/projects/settings/user_manages_group_links_spec.rb
+++ b/spec/features/projects/settings/user_manages_group_links_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'User manages group links' do
+describe 'Projects > Settings > User manages group links' do
   include Select2Helper
 
   let(:user) { create(:user) }
diff --git a/spec/features/projects/settings/merge_requests_settings_spec.rb b/spec/features/projects/settings/user_manages_merge_requests_settings_spec.rb
similarity index 72%
rename from spec/features/projects/settings/merge_requests_settings_spec.rb
rename to spec/features/projects/settings/user_manages_merge_requests_settings_spec.rb
index 015db603d33834cad8bd01bf09763c288bb9c8a7..b6e65fcbda1aed301a7d97b58530534b9d251a22 100644
--- a/spec/features/projects/settings/merge_requests_settings_spec.rb
+++ b/spec/features/projects/settings/user_manages_merge_requests_settings_spec.rb
@@ -1,21 +1,35 @@
 require 'spec_helper'
 
-feature 'Project settings > Merge Requests', :js do
-  let(:project) { create(:project, :public) }
+describe 'Projects > Settings > User manages merge request settings' do
   let(:user) { create(:user) }
+  let(:project) { create(:project, :public, namespace: user.namespace, path: 'gitlab', name: 'sample') }
 
-  background do
-    project.add_master(user)
+  before do
     sign_in(user)
+    visit edit_project_path(project)
   end
 
-  context 'when Merge Request and Pipelines are initially enabled' do
-    context 'when Pipelines are initially enabled' do
-      before do
-        visit edit_project_path(project)
-      end
+  it 'shows "Merge commit" strategy' do
+    page.within '.merge-requests-feature' do
+      expect(page).to have_content 'Merge commit'
+    end
+  end
+
+  it 'shows "Merge commit with semi-linear history " strategy' do
+    page.within '.merge-requests-feature' do
+      expect(page).to have_content 'Merge commit with semi-linear history'
+    end
+  end
 
-      scenario 'shows the Merge Requests settings' do
+  it 'shows "Fast-forward merge" strategy' do
+    page.within '.merge-requests-feature' do
+      expect(page).to have_content 'Fast-forward merge'
+    end
+  end
+
+  context 'when Merge Request and Pipelines are initially enabled', :js do
+    context 'when Pipelines are initially enabled' do
+      it 'shows the Merge Requests settings' 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')
 
@@ -29,13 +43,13 @@ feature 'Project settings > Merge Requests', :js do
       end
     end
 
-    context 'when Pipelines are initially disabled' do
+    context 'when Pipelines are initially disabled', :js do
       before do
         project.project_feature.update_attribute('builds_access_level', ProjectFeature::DISABLED)
         visit edit_project_path(project)
       end
 
-      scenario 'shows the Merge Requests settings that do not depend on Builds feature' do
+      it 'shows the Merge Requests settings that do not depend on Builds feature' 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')
 
@@ -50,13 +64,13 @@ feature 'Project settings > Merge Requests', :js do
     end
   end
 
-  context 'when Merge Request are initially disabled' do
+  context 'when Merge Request are initially disabled', :js do
     before do
       project.project_feature.update_attribute('merge_requests_access_level', ProjectFeature::DISABLED)
       visit edit_project_path(project)
     end
 
-    scenario 'does not show the Merge Requests settings' do
+    it 'does not show the Merge Requests settings' 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')
 
@@ -70,17 +84,13 @@ feature 'Project settings > Merge Requests', :js do
     end
   end
 
-  describe 'Checkbox to enable merge request link' do
-    before do
-      visit edit_project_path(project)
-    end
-
-    scenario 'is initially checked' do
+  describe 'Checkbox to enable merge request link', :js do
+    it 'is initially checked' do
       checkbox = find_field('project_printing_merge_request_link_enabled')
       expect(checkbox).to be_checked
     end
 
-    scenario 'when unchecked sets :printing_merge_request_link_enabled to false' do
+    it 'when unchecked sets :printing_merge_request_link_enabled to false' do
       uncheck('project_printing_merge_request_link_enabled')
       within('.merge-request-settings-form') do
         click_on('Save changes')
diff --git a/spec/features/projects/settings/user_manages_project_members_spec.rb b/spec/features/projects/settings/user_manages_project_members_spec.rb
index 0a4f57bcd21cd8bed7ee2b11ca107fd63b5a3885..8af9552216521d1962781cb728b59cda3a4e9a97 100644
--- a/spec/features/projects/settings/user_manages_project_members_spec.rb
+++ b/spec/features/projects/settings/user_manages_project_members_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'User manages project members' do
+describe 'Projects > Settings > User manages project members' do
   let(:group) { create(:group, name: 'OpenSource') }
   let(:project) { create(:project) }
   let(:project2) { create(:project) }
diff --git a/spec/features/projects/settings/user_renames_a_project_spec.rb b/spec/features/projects/settings/user_renames_a_project_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..64c9af4b70625894a4309749b8475c06d646d0e3
--- /dev/null
+++ b/spec/features/projects/settings/user_renames_a_project_spec.rb
@@ -0,0 +1,100 @@
+require 'spec_helper'
+
+describe 'Projects > Settings > User renames a project' do
+  let(:user) { create(:user) }
+  let(:project) { create(:project, namespace: user.namespace, path: 'gitlab', name: 'sample') }
+
+  before do
+    sign_in(user)
+    visit edit_project_path(project)
+  end
+
+  def rename_project(project, name: nil, path: nil)
+    fill_in('project_name', with: name) if name
+    fill_in('Path', with: path) if path
+    click_button('Rename project')
+    wait_for_edit_project_page_reload
+    project.reload
+  end
+
+  def wait_for_edit_project_page_reload
+    expect(find('.project-edit-container')).to have_content('Rename repository')
+  end
+
+  context 'with invalid characters' do
+    it 'shows errors for invalid project path/name' do
+      rename_project(project, name: 'foo&bar', path: 'foo&bar')
+      expect(page).to have_field 'Project name', with: 'foo&bar'
+      expect(page).to have_field 'Path', with: 'foo&bar'
+      expect(page).to have_content "Name can contain only letters, digits, emojis, '_', '.', dash, space. It must start with letter, digit, emoji or '_'."
+      expect(page).to have_content "Path can contain only letters, digits, '_', '-' and '.'. Cannot start with '-', end in '.git' or end in '.atom'"
+    end
+  end
+
+  it 'shows a successful notice when the project is updated' do
+    fill_in 'project_name_edit', with: 'hello world'
+    page.within('.general-settings') do
+      click_button 'Save changes'
+    end
+
+    expect(page).to have_content "Project 'hello world' was successfully updated."
+  end
+
+  context 'when changing project name' do
+    it 'renames the repository' do
+      rename_project(project, name: 'bar')
+      expect(find('.breadcrumbs')).to have_content(project.name)
+    end
+
+    context 'with emojis' do
+      it 'shows error for invalid project name' do
+        rename_project(project, name: '🚀 foo bar ☁️')
+        expect(page).to have_field 'Project name', with: '🚀 foo bar ☁️'
+        expect(page).not_to have_content "Name can contain only letters, digits, emojis '_', '.', dash and space. It must start with letter, digit, emoji or '_'."
+      end
+    end
+  end
+
+  context 'when changing project path' do
+    let(:project) { create(:project, :repository, namespace: user.namespace, name: 'gitlabhq') }
+
+    before(:context) do
+      TestEnv.clean_test_path
+    end
+
+    after do
+      TestEnv.clean_test_path
+    end
+
+    it 'the project is accessible via the new path' do
+      rename_project(project, path: 'bar')
+      new_path = namespace_project_path(project.namespace, 'bar')
+      visit new_path
+
+      expect(current_path).to eq(new_path)
+      expect(find('.breadcrumbs')).to have_content(project.name)
+    end
+
+    it 'the project is accessible via a redirect from the old path' do
+      old_path = project_path(project)
+      rename_project(project, path: 'bar')
+      new_path = namespace_project_path(project.namespace, 'bar')
+      visit old_path
+
+      expect(current_path).to eq(new_path)
+      expect(find('.breadcrumbs')).to have_content(project.name)
+    end
+
+    context 'and a new project is added with the same path' do
+      it 'overrides the redirect' do
+        old_path = project_path(project)
+        rename_project(project, path: 'bar')
+        new_project = create(:project, namespace: user.namespace, path: 'gitlabhq', name: 'quz')
+        visit old_path
+
+        expect(current_path).to eq(old_path)
+        expect(find('.breadcrumbs')).to have_content(new_project.name)
+      end
+    end
+  end
+end
diff --git a/spec/features/projects/settings/user_tags_project_spec.rb b/spec/features/projects/settings/user_tags_project_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..57b4b1287fa94348ca4161fa6be59b02a97cee79
--- /dev/null
+++ b/spec/features/projects/settings/user_tags_project_spec.rb
@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe 'Projects > Settings > User tags a project' do
+  let(:user) { create(:user) }
+  let(:project) { create(:project, namespace: user.namespace) }
+
+  before do
+    sign_in(user)
+    visit edit_project_path(project)
+  end
+
+  context 'when a project is archived' do
+    it 'unarchives a project' do
+      fill_in 'Tags', with: 'tag1, tag2'
+
+      page.within '.general-settings' do
+        click_button 'Save changes'
+      end
+
+      expect(find_field('Tags').value).to eq 'tag1, tag2'
+    end
+  end
+end
diff --git a/spec/features/projects/settings/user_transfers_a_project_spec.rb b/spec/features/projects/settings/user_transfers_a_project_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..96b7cf1f93b62996569353e7eabdf9e6db1b23be
--- /dev/null
+++ b/spec/features/projects/settings/user_transfers_a_project_spec.rb
@@ -0,0 +1,73 @@
+require 'spec_helper'
+
+describe 'Projects > Settings > User transfers a project', :js do
+  let(:user) { create(:user) }
+  let(:project) { create(:project, :repository, namespace: user.namespace) }
+  let(:group) { create(:group) }
+
+  before do
+    group.add_owner(user)
+    sign_in(user)
+  end
+
+  def transfer_project(project, group)
+    visit edit_project_path(project)
+
+    page.within('.js-project-transfer-form') do
+      page.find('.select2-container').click
+    end
+
+    page.find("div[role='option']", text: group.full_name).click
+
+    click_button('Transfer project')
+
+    fill_in 'confirm_name_input', with: project.name
+
+    click_button 'Confirm'
+
+    wait_for_requests
+  end
+
+  it 'allows transferring a project to a group' do
+    old_path = project_path(project)
+    transfer_project(project, group)
+    new_path = namespace_project_path(group, project)
+
+    expect(project.reload.namespace).to eq(group)
+
+    visit new_path
+    wait_for_requests
+
+    expect(current_path).to eq(new_path)
+    expect(find('.breadcrumbs')).to have_content(project.name)
+
+    visit old_path
+    wait_for_requests
+
+    expect(current_path).to eq(new_path)
+    expect(find('.breadcrumbs')).to have_content(project.name)
+  end
+
+  context 'and a new project is added with the same path' do
+    it 'overrides the redirect' do
+      old_path = project_path(project)
+      project_path = project.path
+      transfer_project(project, group)
+      new_project = create(:project, namespace: user.namespace, path: project_path)
+      visit old_path
+
+      expect(current_path).to eq(old_path)
+      expect(find('.breadcrumbs')).to have_content(new_project.name)
+    end
+  end
+
+  context 'when nested groups are available', :nested_groups do
+    it 'allows transferring a project to a subgroup' do
+      subgroup = create(:group, parent: group)
+
+      transfer_project(project, subgroup)
+
+      expect(project.reload.namespace).to eq(subgroup)
+    end
+  end
+end
diff --git a/spec/features/projects/settings/visibility_settings_spec.rb b/spec/features/projects/settings/visibility_settings_spec.rb
index 06f6702670bb77c4645ee058f867b2e464edc889..2ec6990313ff7576bd1ae0815c2e23ea015b91e6 100644
--- a/spec/features/projects/settings/visibility_settings_spec.rb
+++ b/spec/features/projects/settings/visibility_settings_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-feature 'Visibility settings', :js do
+describe 'Projects > Settings > Visibility settings', :js do
   let(:user) { create(:user) }
   let(:project) { create(:project, namespace: user.namespace, visibility_level: 20) }
 
@@ -10,14 +10,14 @@ feature 'Visibility settings', :js do
       visit edit_project_path(project)
     end
 
-    scenario 'project visibility select is available' do
+    it 'project visibility select is available' do
       visibility_select_container = find('.project-visibility-setting')
 
       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
+    it 'project visibility description updates on change' do
       visibility_select_container = find('.project-visibility-setting')
       visibility_select = visibility_select_container.find('select')
       visibility_select.select('Private')
@@ -25,6 +25,38 @@ feature 'Visibility settings', :js do
       expect(visibility_select.value).to eq '0'
       expect(visibility_select_container).to have_content 'Access must be granted explicitly to each user.'
     end
+
+    context 'merge requests select' do
+      it 'hides merge requests section' do
+        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
+
+      context 'given project with merge_requests_disabled access level' do
+        let(:project) { create(:project, :merge_requests_disabled, namespace: user.namespace) }
+
+        it 'hides merge requests section' do
+          expect(page).to have_selector('.merge-requests-feature', visible: false)
+        end
+      end
+    end
+
+    context 'builds select' do
+      it 'hides builds select section' do
+        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
+
+      context 'given project with builds_disabled access level' do
+        let(:project) { create(:project, :builds_disabled, namespace: user.namespace) }
+
+        it 'hides builds select section' do
+          expect(page).to have_selector('.builds-feature', visible: false)
+        end
+      end
+    end
   end
 
   context 'as master' do
@@ -36,7 +68,7 @@ feature 'Visibility settings', :js do
       visit edit_project_path(project)
     end
 
-    scenario 'project visibility is locked' do
+    it 'project visibility is locked' do
       visibility_select_container = find('.project-visibility-setting')
 
       expect(visibility_select_container).to have_selector 'select[name="project[visibility_level]"]:disabled'
diff --git a/spec/features/projects/developer_views_empty_project_instructions_spec.rb b/spec/features/projects/show/developer_views_empty_project_instructions_spec.rb
similarity index 94%
rename from spec/features/projects/developer_views_empty_project_instructions_spec.rb
rename to spec/features/projects/show/developer_views_empty_project_instructions_spec.rb
index bf55917bf4c09b7ff73d33c943ed21b3445c611e..8803b5222be8a63ea5dac01a497d48450fb74344 100644
--- a/spec/features/projects/developer_views_empty_project_instructions_spec.rb
+++ b/spec/features/projects/show/developer_views_empty_project_instructions_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-feature 'Developer views empty project instructions' do
+feature 'Projects > Show > Developer views empty project instructions' do
   let(:project) { create(:project, :empty_repo) }
   let(:developer) { create(:user) }
 
diff --git a/spec/features/projects/main/download_buttons_spec.rb b/spec/features/projects/show/download_buttons_spec.rb
similarity index 96%
rename from spec/features/projects/main/download_buttons_spec.rb
rename to spec/features/projects/show/download_buttons_spec.rb
index 81f08e44cf3f8b3d076067201be5d61adeaab43b..254affd4a9422cbe738266dc1f9908513a51cf8d 100644
--- a/spec/features/projects/main/download_buttons_spec.rb
+++ b/spec/features/projects/show/download_buttons_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-feature 'Download buttons in project main page' do
+feature 'Projects > Show > Download buttons' do
   given(:user) { create(:user) }
   given(:role) { :developer }
   given(:status) { 'success' }
diff --git a/spec/features/projects/no_password_spec.rb b/spec/features/projects/show/no_password_spec.rb
similarity index 100%
rename from spec/features/projects/no_password_spec.rb
rename to spec/features/projects/show/no_password_spec.rb
diff --git a/spec/features/projects/redirects_spec.rb b/spec/features/projects/show/redirects_spec.rb
similarity index 97%
rename from spec/features/projects/redirects_spec.rb
rename to spec/features/projects/show/redirects_spec.rb
index d1d8ca07035a73907af48bf11ac6fb0e933493e7..8d41c547d77149d47ac04d8ca5a42225d8a2d61a 100644
--- a/spec/features/projects/redirects_spec.rb
+++ b/spec/features/projects/show/redirects_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Project redirects' do
+describe 'Projects > Show > Redirects' do
   let(:user) { create :user }
   let(:public_project) { create :project, :public }
   let(:private_project) { create :project, :private }
diff --git a/spec/features/projects/main/rss_spec.rb b/spec/features/projects/show/rss_spec.rb
similarity index 94%
rename from spec/features/projects/main/rss_spec.rb
rename to spec/features/projects/show/rss_spec.rb
index 3c98c11b4903cee06e36333219ac562def8238ef..d02eaf3453357896b88c3e43b235abc9862f867f 100644
--- a/spec/features/projects/main/rss_spec.rb
+++ b/spec/features/projects/show/rss_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-feature 'Project RSS' do
+feature 'Projects > Show > RSS' do
   let(:user) { create(:user) }
   let(:project) { create(:project, :repository, visibility_level: Gitlab::VisibilityLevel::PUBLIC) }
   let(:path) { project_path(project) }
diff --git a/spec/features/projects/user_interacts_with_stars_spec.rb b/spec/features/projects/show/user_interacts_with_stars_spec.rb
similarity index 92%
rename from spec/features/projects/user_interacts_with_stars_spec.rb
rename to spec/features/projects/show/user_interacts_with_stars_spec.rb
index d9d2e0ab1713fd905e638cb679b44a334075b9f4..ba28c0e1b8ad78cb7ca81e7a4357f18f7575200e 100644
--- a/spec/features/projects/user_interacts_with_stars_spec.rb
+++ b/spec/features/projects/show/user_interacts_with_stars_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'User interacts with project stars' do
+describe 'Projects > Show > User interacts with project stars' do
   let(:project) { create(:project, :public, :repository) }
 
   context 'when user is signed in', :js do
diff --git a/spec/features/projects/show/user_manages_notifications_spec.rb b/spec/features/projects/show/user_manages_notifications_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..31b105229bef69206be6314b62d7c5634ba379ea
--- /dev/null
+++ b/spec/features/projects/show/user_manages_notifications_spec.rb
@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe 'Projects > Show > User manages notifications', :js do
+  let(:project) { create(:project, :public, :repository) }
+
+  before do
+    sign_in(project.owner)
+    visit project_path(project)
+  end
+
+  it 'changes the notification setting' do
+    first('.notifications-btn').click
+    click_link 'On mention'
+
+    page.within '#notifications-button' do
+      expect(page).to have_content 'On mention'
+    end
+  end
+end
diff --git a/spec/features/projects/show/user_sees_deletion_failure_message_spec.rb b/spec/features/projects/show/user_sees_deletion_failure_message_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..aa23bef6fd88500561c3f089a582a63f8cdff136
--- /dev/null
+++ b/spec/features/projects/show/user_sees_deletion_failure_message_spec.rb
@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe 'Projects > Show > User sees a deletion failure message' do
+  let(:project) { create(:project, :empty_repo, pending_delete: true) }
+
+  before do
+    sign_in(project.owner)
+  end
+
+  it 'shows error message if deletion for project fails' do
+    project.update_attributes(delete_error: "Something went wrong", pending_delete: false)
+
+    visit project_path(project)
+
+    expect(page).to have_selector('.project-deletion-failed-message')
+    expect(page).to have_content("This project was scheduled for deletion, but failed with the following message: #{project.delete_error}")
+  end
+end
diff --git a/spec/features/projects/user_views_details_spec.rb b/spec/features/projects/show/user_sees_git_instructions_spec.rb
similarity index 85%
rename from spec/features/projects/user_views_details_spec.rb
rename to spec/features/projects/show/user_sees_git_instructions_spec.rb
index ffc063654cd1a8a4f86c43d1c17db7b33ede1a34..9a82fee1b5d08a66f0412685bff8b63e5461c087 100644
--- a/spec/features/projects/user_views_details_spec.rb
+++ b/spec/features/projects/show/user_sees_git_instructions_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'User views details' do
+describe 'Projects > Show > User sees Git instructions' do
   set(:user) { create(:user) }
 
   shared_examples_for 'redirects to the sign in page' do
@@ -9,6 +9,16 @@ describe 'User views details' do
     end
   end
 
+  shared_examples_for 'shows details of empty project with no repo' do
+    it 'shows Git command line instructions' do
+      click_link 'Create empty repository'
+
+      page.within '.empty_wrapper' do
+        expect(page).to have_content('Command line instructions')
+      end
+    end
+  end
+
   shared_examples_for 'shows details of empty project' do
     let(:user_has_ssh_key) { false }
 
@@ -36,6 +46,17 @@ describe 'User views details' do
   end
 
   context 'when project is public' do
+    context 'when project has no repo' do
+      set(:project) { create(:project, :public) }
+
+      before do
+        sign_in(project.owner)
+        visit project_path(project)
+      end
+
+      include_examples 'shows details of empty project with no repo'
+    end
+
     context 'when project is empty' do
       set(:project) { create(:project_empty_repo, :public) }
 
diff --git a/spec/features/projects/show/user_sees_last_commit_ci_status_spec.rb b/spec/features/projects/show/user_sees_last_commit_ci_status_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..e277bfb8011cea0370b12d7cb0c858ec8888c3bc
--- /dev/null
+++ b/spec/features/projects/show/user_sees_last_commit_ci_status_spec.rb
@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe 'Projects > Show > User sees last commit CI status' do
+  set(:project) { create(:project, :repository, :public) }
+
+  it 'shows the project README', :js do
+    project.enable_ci
+    pipeline = create(:ci_pipeline, project: project, sha: project.commit.sha, ref: 'master')
+    pipeline.skip
+
+    visit project_path(project)
+
+    page.within '.blob-commit-info' do
+      expect(page).to have_content(project.commit.sha[0..6])
+      expect(page).to have_link('Commit: skipped')
+    end
+  end
+end
diff --git a/spec/features/projects/show/user_sees_readme_spec.rb b/spec/features/projects/show/user_sees_readme_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..d80606c1c236221664ebce10826283abc207d0dd
--- /dev/null
+++ b/spec/features/projects/show/user_sees_readme_spec.rb
@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe 'Projects > Show > User sees README' do
+  set(:user) { create(:user) }
+
+  set(:project) { create(:project, :repository, :public) }
+
+  it 'shows the project README', :js do
+    visit project_path(project)
+    wait_for_requests
+
+    page.within('.readme-holder') do
+      expect(page).to have_content 'testme'
+    end
+  end
+end
diff --git a/spec/features/projects/show/user_sees_setup_shortcut_buttons_spec.rb b/spec/features/projects/show/user_sees_setup_shortcut_buttons_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..a906fa20233b50f405af686c62f75aa64b9a3e1e
--- /dev/null
+++ b/spec/features/projects/show/user_sees_setup_shortcut_buttons_spec.rb
@@ -0,0 +1,318 @@
+require 'spec_helper'
+
+describe 'Projects > Show > User sees setup shortcut buttons' do
+  # For "New file", "Add License" functionality,
+  # see spec/features/projects/files/project_owner_creates_license_file_spec.rb
+  # see spec/features/projects/files/project_owner_sees_link_to_create_license_file_in_empty_project_spec.rb
+
+  let(:user) { create(:user) }
+
+  describe 'empty project' do
+    let(:project) { create(:project, :public, :empty_repo) }
+    let(:presenter) { project.present(current_user: user) }
+
+    describe 'as a normal user' do
+      before do
+        sign_in(user)
+
+        visit project_path(project)
+      end
+
+      it 'no Auto DevOps button if can not manage pipelines' do
+        page.within('.project-stats') do
+          expect(page).not_to have_link('Enable Auto DevOps')
+          expect(page).not_to have_link('Auto DevOps enabled')
+        end
+      end
+
+      it '"Auto DevOps enabled" button not linked' do
+        project.create_auto_devops!(enabled: true)
+
+        visit project_path(project)
+
+        page.within('.project-stats') do
+          expect(page).to have_text('Auto DevOps enabled')
+        end
+      end
+    end
+
+    describe 'as a master' do
+      before do
+        project.add_master(user)
+        sign_in(user)
+
+        visit project_path(project)
+      end
+
+      it '"New file" button linked to new file page' do
+        page.within('.project-stats') do
+          expect(page).to have_link('New file', href: project_new_blob_path(project, project.default_branch || 'master'))
+        end
+      end
+
+      it '"Add Readme" button linked to new file populated for a readme' do
+        page.within('.project-stats') do
+          expect(page).to have_link('Add Readme', href: presenter.add_readme_path)
+        end
+      end
+
+      it '"Add License" button linked to new file populated for a license' do
+        page.within('.project-stats') do
+          expect(page).to have_link('Add License', href: presenter.add_license_path)
+        end
+      end
+
+      describe 'Auto DevOps button' do
+        it '"Enable Auto DevOps" button linked to settings page' do
+          page.within('.project-stats') do
+            expect(page).to have_link('Enable Auto DevOps', href: project_settings_ci_cd_path(project, anchor: 'js-general-pipeline-settings'))
+          end
+        end
+
+        it '"Auto DevOps enabled" anchor linked to settings page' do
+          project.create_auto_devops!(enabled: true)
+
+          visit project_path(project)
+
+          page.within('.project-stats') do
+            expect(page).to have_link('Auto DevOps enabled', href: project_settings_ci_cd_path(project, anchor: 'js-general-pipeline-settings'))
+          end
+        end
+      end
+
+      describe 'Kubernetes cluster button' do
+        it '"Add Kubernetes cluster" button linked to clusters page' do
+          page.within('.project-stats') do
+            expect(page).to have_link('Add Kubernetes cluster', href: new_project_cluster_path(project))
+          end
+        end
+
+        it '"Kubernetes cluster" anchor linked to cluster page' do
+          cluster = create(:cluster, :provided_by_gcp, projects: [project])
+
+          visit project_path(project)
+
+          page.within('.project-stats') do
+            expect(page).to have_link('Kubernetes configured', href: project_cluster_path(project, cluster))
+          end
+        end
+      end
+    end
+  end
+
+  describe 'populated project' do
+    let(:project) { create(:project, :public, :repository) }
+    let(:presenter) { project.present(current_user: user) }
+
+    describe 'as a normal user' do
+      before do
+        sign_in(user)
+
+        visit project_path(project)
+      end
+
+      it 'no Auto DevOps button if can not manage pipelines' do
+        page.within('.project-stats') do
+          expect(page).not_to have_link('Enable Auto DevOps')
+          expect(page).not_to have_link('Auto DevOps enabled')
+        end
+      end
+
+      it '"Auto DevOps enabled" button not linked' do
+        project.create_auto_devops!(enabled: true)
+
+        visit project_path(project)
+
+        page.within('.project-stats') do
+          expect(page).to have_text('Auto DevOps enabled')
+        end
+      end
+
+      it 'no Kubernetes cluster button if can not manage clusters' do
+        page.within('.project-stats') do
+          expect(page).not_to have_link('Add Kubernetes cluster')
+          expect(page).not_to have_link('Kubernetes configured')
+        end
+      end
+    end
+
+    describe 'as a master' do
+      before do
+        allow_any_instance_of(AutoDevopsHelper).to receive(:show_auto_devops_callout?).and_return(false)
+        project.add_master(user)
+        sign_in(user)
+
+        visit project_path(project)
+      end
+
+      it 'no "Add Changelog" button if the project already has a changelog' do
+        expect(project.repository.changelog).not_to be_nil
+
+        page.within('.project-stats') do
+          expect(page).not_to have_link('Add Changelog')
+        end
+      end
+
+      it 'no "Add License" button if the project already has a license' do
+        expect(project.repository.license_blob).not_to be_nil
+
+        page.within('.project-stats') do
+          expect(page).not_to have_link('Add License')
+        end
+      end
+
+      it 'no "Add Contribution guide" button if the project already has a contribution guide' do
+        expect(project.repository.contribution_guide).not_to be_nil
+
+        page.within('.project-stats') do
+          expect(page).not_to have_link('Add Contribution guide')
+        end
+      end
+
+      describe 'GitLab CI configuration button' do
+        it '"Set up CI/CD" button linked to new file populated for a .gitlab-ci.yml' do
+          expect(project.repository.gitlab_ci_yml).to be_nil
+
+          page.within('.project-stats') do
+            expect(page).to have_link('Set up CI/CD', href: presenter.add_ci_yml_path)
+          end
+        end
+
+        it 'no "Set up CI/CD" button if the project already has a .gitlab-ci.yml' do
+          Files::CreateService.new(
+            project,
+            project.creator,
+            start_branch: 'master',
+            branch_name: 'master',
+            commit_message: "Add .gitlab-ci.yml",
+            file_path: '.gitlab-ci.yml',
+            file_content: File.read(Rails.root.join('spec/support/gitlab_stubs/gitlab_ci.yml'))
+          ).execute
+
+          expect(project.repository.gitlab_ci_yml).not_to be_nil
+
+          visit project_path(project)
+
+          page.within('.project-stats') do
+            expect(page).not_to have_link('Set up CI/CD')
+          end
+        end
+
+        it 'no "Set up CI/CD" button if the project has Auto DevOps enabled' do
+          project.create_auto_devops!(enabled: true)
+
+          visit project_path(project)
+
+          page.within('.project-stats') do
+            expect(page).not_to have_link('Set up CI/CD')
+          end
+        end
+      end
+
+      describe 'Auto DevOps button' do
+        it '"Enable Auto DevOps" button linked to settings page' do
+          page.within('.project-stats') do
+            expect(page).to have_link('Enable Auto DevOps', href: project_settings_ci_cd_path(project, anchor: 'js-general-pipeline-settings'))
+          end
+        end
+
+        it '"Enable Auto DevOps" button linked to settings page' do
+          project.create_auto_devops!(enabled: true)
+
+          visit project_path(project)
+
+          page.within('.project-stats') do
+            expect(page).to have_link('Auto DevOps enabled', href: project_settings_ci_cd_path(project, anchor: 'js-general-pipeline-settings'))
+          end
+        end
+
+        it 'no Auto DevOps button if Auto DevOps callout is shown' do
+          allow_any_instance_of(AutoDevopsHelper).to receive(:show_auto_devops_callout?).and_return(true)
+
+          visit project_path(project)
+
+          expect(page).to have_selector('.js-autodevops-banner')
+
+          page.within('.project-stats') do
+            expect(page).not_to have_link('Enable Auto DevOps')
+            expect(page).not_to have_link('Auto DevOps enabled')
+          end
+        end
+
+        it 'no "Enable Auto DevOps" button when .gitlab-ci.yml already exists' do
+          Files::CreateService.new(
+            project,
+            project.creator,
+            start_branch: 'master',
+            branch_name: 'master',
+            commit_message: "Add .gitlab-ci.yml",
+            file_path: '.gitlab-ci.yml',
+            file_content: File.read(Rails.root.join('spec/support/gitlab_stubs/gitlab_ci.yml'))
+          ).execute
+
+          expect(project.repository.gitlab_ci_yml).not_to be_nil
+
+          visit project_path(project)
+
+          page.within('.project-stats') do
+            expect(page).not_to have_link('Enable Auto DevOps')
+            expect(page).not_to have_link('Auto DevOps enabled')
+          end
+        end
+      end
+
+      describe 'Kubernetes cluster button' do
+        it '"Add Kubernetes cluster" button linked to clusters page' do
+          page.within('.project-stats') do
+            expect(page).to have_link('Add Kubernetes cluster', href: new_project_cluster_path(project))
+          end
+        end
+
+        it '"Kubernetes cluster" button linked to cluster page' do
+          cluster = create(:cluster, :provided_by_gcp, projects: [project])
+
+          visit project_path(project)
+
+          page.within('.project-stats') do
+            expect(page).to have_link('Kubernetes configured', href: project_cluster_path(project, cluster))
+          end
+        end
+      end
+
+      describe '"Set up Koding" button' do
+        it 'no "Set up Koding" button if Koding disabled' do
+          stub_application_setting(koding_enabled?: false)
+
+          visit project_path(project)
+
+          page.within('.project-stats') do
+            expect(page).not_to have_link('Set up Koding')
+          end
+        end
+
+        it 'no "Set up Koding" button if the project already has a .koding.yml' do
+          stub_application_setting(koding_enabled?: true)
+          allow(Gitlab::CurrentSettings.current_application_settings).to receive(:koding_url).and_return('http://koding.example.com')
+          expect(project.repository.changelog).not_to be_nil
+          allow_any_instance_of(Repository).to receive(:koding_yml).and_return(project.repository.changelog)
+
+          visit project_path(project)
+
+          page.within('.project-stats') do
+            expect(page).not_to have_link('Set up Koding')
+          end
+        end
+
+        it '"Set up Koding" button linked to new file populated for a .koding.yml' do
+          stub_application_setting(koding_enabled?: true)
+
+          visit project_path(project)
+
+          page.within('.project-stats') do
+            expect(page).to have_link('Set up Koding', href: presenter.add_koding_stack_path)
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/spec/features/projects/show_project_spec.rb b/spec/features/projects/show_project_spec.rb
deleted file mode 100644
index e4f13e6cab7e0cb8399640fe42a001327c84d913..0000000000000000000000000000000000000000
--- a/spec/features/projects/show_project_spec.rb
+++ /dev/null
@@ -1,359 +0,0 @@
-require 'spec_helper'
-
-describe 'Project show page', :feature do
-  include DropzoneHelper
-
-  context 'when project pending delete' do
-    let(:project) { create(:project, :empty_repo, pending_delete: true) }
-
-    before do
-      sign_in(project.owner)
-    end
-
-    it 'shows error message if deletion for project fails' do
-      project.update_attributes(delete_error: "Something went wrong", pending_delete: false)
-
-      visit project_path(project)
-
-      expect(page).to have_selector('.project-deletion-failed-message')
-      expect(page).to have_content("This project was scheduled for deletion, but failed with the following message: #{project.delete_error}")
-    end
-  end
-
-  describe 'stat button existence' do
-    # For "New file", "Add License" functionality,
-    # see spec/features/projects/files/project_owner_creates_license_file_spec.rb
-    # see spec/features/projects/files/project_owner_sees_link_to_create_license_file_in_empty_project_spec.rb
-
-    let(:user) { create(:user) }
-
-    describe 'empty project' do
-      let(:project) { create(:project, :public, :empty_repo) }
-      let(:presenter) { project.present(current_user: user) }
-
-      describe 'as a normal user' do
-        before do
-          sign_in(user)
-
-          visit project_path(project)
-        end
-
-        it 'no Auto DevOps button if can not manage pipelines' do
-          page.within('.project-stats') do
-            expect(page).not_to have_link('Enable Auto DevOps')
-            expect(page).not_to have_link('Auto DevOps enabled')
-          end
-        end
-
-        it '"Auto DevOps enabled" button not linked' do
-          project.create_auto_devops!(enabled: true)
-
-          visit project_path(project)
-
-          page.within('.project-stats') do
-            expect(page).to have_text('Auto DevOps enabled')
-          end
-        end
-      end
-
-      describe 'as a master' do
-        before do
-          project.add_master(user)
-          sign_in(user)
-
-          visit project_path(project)
-        end
-
-        it '"New file" button linked to new file page' do
-          page.within('.project-stats') do
-            expect(page).to have_link('New file', href: project_new_blob_path(project, project.default_branch || 'master'))
-          end
-        end
-
-        it '"Add Readme" button linked to new file populated for a readme' do
-          page.within('.project-stats') do
-            expect(page).to have_link('Add Readme', href: presenter.add_readme_path)
-          end
-        end
-
-        it '"Add License" button linked to new file populated for a license' do
-          page.within('.project-stats') do
-            expect(page).to have_link('Add License', href: presenter.add_license_path)
-          end
-        end
-
-        describe 'Auto DevOps button' do
-          it '"Enable Auto DevOps" button linked to settings page' do
-            page.within('.project-stats') do
-              expect(page).to have_link('Enable Auto DevOps', href: project_settings_ci_cd_path(project, anchor: 'js-general-pipeline-settings'))
-            end
-          end
-
-          it '"Auto DevOps enabled" anchor linked to settings page' do
-            project.create_auto_devops!(enabled: true)
-
-            visit project_path(project)
-
-            page.within('.project-stats') do
-              expect(page).to have_link('Auto DevOps enabled', href: project_settings_ci_cd_path(project, anchor: 'js-general-pipeline-settings'))
-            end
-          end
-        end
-
-        describe 'Kubernetes cluster button' do
-          it '"Add Kubernetes cluster" button linked to clusters page' do
-            page.within('.project-stats') do
-              expect(page).to have_link('Add Kubernetes cluster', href: new_project_cluster_path(project))
-            end
-          end
-
-          it '"Kubernetes cluster" anchor linked to cluster page' do
-            cluster = create(:cluster, :provided_by_gcp, projects: [project])
-
-            visit project_path(project)
-
-            page.within('.project-stats') do
-              expect(page).to have_link('Kubernetes configured', href: project_cluster_path(project, cluster))
-            end
-          end
-        end
-      end
-    end
-
-    describe 'populated project' do
-      let(:project) { create(:project, :public, :repository) }
-      let(:presenter) { project.present(current_user: user) }
-
-      describe 'as a normal user' do
-        before do
-          sign_in(user)
-
-          visit project_path(project)
-        end
-
-        it 'no Auto DevOps button if can not manage pipelines' do
-          page.within('.project-stats') do
-            expect(page).not_to have_link('Enable Auto DevOps')
-            expect(page).not_to have_link('Auto DevOps enabled')
-          end
-        end
-
-        it '"Auto DevOps enabled" button not linked' do
-          project.create_auto_devops!(enabled: true)
-
-          visit project_path(project)
-
-          page.within('.project-stats') do
-            expect(page).to have_text('Auto DevOps enabled')
-          end
-        end
-
-        it 'no Kubernetes cluster button if can not manage clusters' do
-          page.within('.project-stats') do
-            expect(page).not_to have_link('Add Kubernetes cluster')
-            expect(page).not_to have_link('Kubernetes configured')
-          end
-        end
-      end
-
-      describe 'as a master' do
-        before do
-          allow_any_instance_of(AutoDevopsHelper).to receive(:show_auto_devops_callout?).and_return(false)
-          project.add_master(user)
-          sign_in(user)
-
-          visit project_path(project)
-        end
-
-        it 'no "Add Changelog" button if the project already has a changelog' do
-          expect(project.repository.changelog).not_to be_nil
-
-          page.within('.project-stats') do
-            expect(page).not_to have_link('Add Changelog')
-          end
-        end
-
-        it 'no "Add License" button if the project already has a license' do
-          expect(project.repository.license_blob).not_to be_nil
-
-          page.within('.project-stats') do
-            expect(page).not_to have_link('Add License')
-          end
-        end
-
-        it 'no "Add Contribution guide" button if the project already has a contribution guide' do
-          expect(project.repository.contribution_guide).not_to be_nil
-
-          page.within('.project-stats') do
-            expect(page).not_to have_link('Add Contribution guide')
-          end
-        end
-
-        describe 'GitLab CI configuration button' do
-          it '"Set up CI/CD" button linked to new file populated for a .gitlab-ci.yml' do
-            expect(project.repository.gitlab_ci_yml).to be_nil
-
-            page.within('.project-stats') do
-              expect(page).to have_link('Set up CI/CD', href: presenter.add_ci_yml_path)
-            end
-          end
-
-          it 'no "Set up CI/CD" button if the project already has a .gitlab-ci.yml' do
-            Files::CreateService.new(
-              project,
-              project.creator,
-              start_branch: 'master',
-              branch_name: 'master',
-              commit_message: "Add .gitlab-ci.yml",
-              file_path: '.gitlab-ci.yml',
-              file_content: File.read(Rails.root.join('spec/support/gitlab_stubs/gitlab_ci.yml'))
-            ).execute
-
-            expect(project.repository.gitlab_ci_yml).not_to be_nil
-
-            visit project_path(project)
-
-            page.within('.project-stats') do
-              expect(page).not_to have_link('Set up CI/CD')
-            end
-          end
-
-          it 'no "Set up CI/CD" button if the project has Auto DevOps enabled' do
-            project.create_auto_devops!(enabled: true)
-
-            visit project_path(project)
-
-            page.within('.project-stats') do
-              expect(page).not_to have_link('Set up CI/CD')
-            end
-          end
-        end
-
-        describe 'Auto DevOps button' do
-          it '"Enable Auto DevOps" button linked to settings page' do
-            page.within('.project-stats') do
-              expect(page).to have_link('Enable Auto DevOps', href: project_settings_ci_cd_path(project, anchor: 'js-general-pipeline-settings'))
-            end
-          end
-
-          it '"Enable Auto DevOps" button linked to settings page' do
-            project.create_auto_devops!(enabled: true)
-
-            visit project_path(project)
-
-            page.within('.project-stats') do
-              expect(page).to have_link('Auto DevOps enabled', href: project_settings_ci_cd_path(project, anchor: 'js-general-pipeline-settings'))
-            end
-          end
-
-          it 'no Auto DevOps button if Auto DevOps callout is shown' do
-            allow_any_instance_of(AutoDevopsHelper).to receive(:show_auto_devops_callout?).and_return(true)
-
-            visit project_path(project)
-
-            expect(page).to have_selector('.js-autodevops-banner')
-
-            page.within('.project-stats') do
-              expect(page).not_to have_link('Enable Auto DevOps')
-              expect(page).not_to have_link('Auto DevOps enabled')
-            end
-          end
-
-          it 'no "Enable Auto DevOps" button when .gitlab-ci.yml already exists' do
-            Files::CreateService.new(
-              project,
-              project.creator,
-              start_branch: 'master',
-              branch_name: 'master',
-              commit_message: "Add .gitlab-ci.yml",
-              file_path: '.gitlab-ci.yml',
-              file_content: File.read(Rails.root.join('spec/support/gitlab_stubs/gitlab_ci.yml'))
-            ).execute
-
-            expect(project.repository.gitlab_ci_yml).not_to be_nil
-
-            visit project_path(project)
-
-            page.within('.project-stats') do
-              expect(page).not_to have_link('Enable Auto DevOps')
-              expect(page).not_to have_link('Auto DevOps enabled')
-            end
-          end
-        end
-
-        describe 'Kubernetes cluster button' do
-          it '"Add Kubernetes cluster" button linked to clusters page' do
-            page.within('.project-stats') do
-              expect(page).to have_link('Add Kubernetes cluster', href: new_project_cluster_path(project))
-            end
-          end
-
-          it '"Kubernetes cluster" button linked to cluster page' do
-            cluster = create(:cluster, :provided_by_gcp, projects: [project])
-
-            visit project_path(project)
-
-            page.within('.project-stats') do
-              expect(page).to have_link('Kubernetes configured', href: project_cluster_path(project, cluster))
-            end
-          end
-        end
-
-        describe '"Set up Koding" button' do
-          it 'no "Set up Koding" button if Koding disabled' do
-            stub_application_setting(koding_enabled?: false)
-
-            visit project_path(project)
-
-            page.within('.project-stats') do
-              expect(page).not_to have_link('Set up Koding')
-            end
-          end
-
-          it 'no "Set up Koding" button if the project already has a .koding.yml' do
-            stub_application_setting(koding_enabled?: true)
-            allow(Gitlab::CurrentSettings.current_application_settings).to receive(:koding_url).and_return('http://koding.example.com')
-            expect(project.repository.changelog).not_to be_nil
-            allow_any_instance_of(Repository).to receive(:koding_yml).and_return(project.repository.changelog)
-
-            visit project_path(project)
-
-            page.within('.project-stats') do
-              expect(page).not_to have_link('Set up Koding')
-            end
-          end
-
-          it '"Set up Koding" button linked to new file populated for a .koding.yml' do
-            stub_application_setting(koding_enabled?: true)
-
-            visit project_path(project)
-
-            page.within('.project-stats') do
-              expect(page).to have_link('Set up Koding', href: presenter.add_koding_stack_path)
-            end
-          end
-        end
-      end
-    end
-  end
-
-  describe 'dropzone', :js do
-    let(:project) { create(:project, :repository) }
-    let(:user) { create(:user) }
-
-    before do
-      project.add_master(user)
-      sign_in(user)
-
-      visit project_path(project)
-    end
-
-    it 'can upload files' do
-      find('.add-to-tree').click
-      click_link 'Upload file'
-      drop_in_dropzone(File.join(Rails.root, 'spec', 'fixtures', 'doc_sample.txt'))
-
-      expect(find('.dz-filename')).to have_content('doc_sample.txt')
-    end
-  end
-end
diff --git a/spec/features/projects/snippets/create_snippet_spec.rb b/spec/features/projects/snippets/create_snippet_spec.rb
index 3466a3dfb778cb7381a22c965073cb19b187d06c..2388feeb98026e87c00daf2c79324b5f59c5f889 100644
--- a/spec/features/projects/snippets/create_snippet_spec.rb
+++ b/spec/features/projects/snippets/create_snippet_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-feature 'Create Snippet', :js do
+describe 'Projects > Snippets > Create Snippet', :js do
   include DropzoneHelper
 
   let(:user) { create(:user) }
diff --git a/spec/features/projects/snippets/show_spec.rb b/spec/features/projects/snippets/show_spec.rb
index 216f2af7c886d832ea2757cc846185df51c7299d..004ac55b65607554eb97ad9cf4d6b9202b1fbd92 100644
--- a/spec/features/projects/snippets/show_spec.rb
+++ b/spec/features/projects/snippets/show_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-feature 'Project snippet', :js do
+describe 'Projects > Snippets > Project snippet', :js do
   let(:user) { create(:user) }
   let(:project) { create(:project, :repository) }
   let(:snippet) { create(:project_snippet, project: project, file_name: file_name, content: content) }
diff --git a/spec/features/projects/snippets/user_comments_on_snippet_spec.rb b/spec/features/projects/snippets/user_comments_on_snippet_spec.rb
index 1bd2098af6ddc289efc89599a3f5ef519618b454..01cf9740d1f5cf454c98f64b795ec7cf27800c34 100644
--- a/spec/features/projects/snippets/user_comments_on_snippet_spec.rb
+++ b/spec/features/projects/snippets/user_comments_on_snippet_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'User comments on a snippet', :js do
+describe 'Projects > Snippets > User comments on a snippet', :js do
   let(:project) { create(:project) }
   let!(:snippet) { create(:project_snippet, project: project, author: user) }
   let(:user) { create(:user) }
@@ -22,4 +22,16 @@ describe 'User comments on a snippet', :js do
 
     expect(page).to have_content('Good snippet!')
   end
+
+  it 'should have autocomplete' do
+    find('#note_note').native.send_keys('')
+    fill_in 'note[note]', with: '@'
+
+    expect(page).to have_selector('.atwho-view')
+  end
+
+  it 'should have zen mode' do
+    find('.js-zen-enter').click()
+    expect(page).to have_selector('.fullscreen')
+  end
 end
diff --git a/spec/features/projects/snippets/user_deletes_snippet_spec.rb b/spec/features/projects/snippets/user_deletes_snippet_spec.rb
index ca5f7981c3365dc2bcb4e6bb0d9e42cbc3158179..e64837ad59ec6ac24d67d57c2af5d8e4ea6704aa 100644
--- a/spec/features/projects/snippets/user_deletes_snippet_spec.rb
+++ b/spec/features/projects/snippets/user_deletes_snippet_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'User deletes a snippet' do
+describe 'Projects > Snippets > User deletes a snippet' do
   let(:project) { create(:project) }
   let!(:snippet) { create(:project_snippet, project: project, author: user) }
   let(:user) { create(:user) }
diff --git a/spec/features/projects/snippets/user_updates_snippet_spec.rb b/spec/features/projects/snippets/user_updates_snippet_spec.rb
index 09a390443cfa166e53787919d48cf9624bb904eb..eaedbbf32b6ce977fa17be73bd1dc00940b2562e 100644
--- a/spec/features/projects/snippets/user_updates_snippet_spec.rb
+++ b/spec/features/projects/snippets/user_updates_snippet_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'User updates a snippet' do
+describe 'Projects > Snippets > User updates a snippet' do
   let(:project) { create(:project) }
   let!(:snippet) { create(:project_snippet, project: project, author: user) }
   let(:user) { create(:user) }
diff --git a/spec/features/projects/snippets/user_views_snippets_spec.rb b/spec/features/projects/snippets/user_views_snippets_spec.rb
index e9992e00ca8c551d66d70000ecce6c6a6079daa1..376b76e0001a259b1b3fd5b3bd913b3c94ea046f 100644
--- a/spec/features/projects/snippets/user_views_snippets_spec.rb
+++ b/spec/features/projects/snippets/user_views_snippets_spec.rb
@@ -1,9 +1,10 @@
 require 'spec_helper'
 
-describe 'User views snippets' do
+describe 'Projects > Snippets > User views snippets' do
   let(:project) { create(:project) }
   let!(:project_snippet) { create(:project_snippet, project: project, author: user) }
   let!(:snippet) { create(:snippet, author: user) }
+  let(:snippets) { [project_snippet, snippet] } # Used by the shared examples
   let(:user) { create(:user) }
 
   before do
@@ -13,6 +14,17 @@ describe 'User views snippets' do
     visit(project_snippets_path(project))
   end
 
+  context 'pagination' do
+    before do
+      create(:project_snippet, project: project, author: user)
+      allow(Snippet).to receive(:default_per_page).and_return(1)
+
+      visit project_snippets_path(project)
+    end
+
+    it_behaves_like 'paginated snippets'
+  end
+
   it 'shows snippets' do
     expect(page).to have_content(project_snippet.title)
     expect(page).not_to have_content(snippet.title)
diff --git a/spec/features/projects/snippets_spec.rb b/spec/features/projects/snippets_spec.rb
deleted file mode 100644
index 0fa7ca9afd46e999c016425c003f8ac13fb57e73..0000000000000000000000000000000000000000
--- a/spec/features/projects/snippets_spec.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-require 'spec_helper'
-
-describe 'Project snippets', :js do
-  context 'when the project has snippets' do
-    let(:project) { create(:project, :public) }
-    let!(:snippets) { create_list(:project_snippet, 2, :public, author: project.owner, project: project) }
-    let!(:other_snippet) { create(:project_snippet) }
-
-    context 'pagination' do
-      before do
-        allow(Snippet).to receive(:default_per_page).and_return(1)
-
-        visit project_snippets_path(project)
-      end
-
-      it_behaves_like 'paginated snippets'
-    end
-
-    context 'list content' do
-      it 'contains all project snippets' do
-        visit project_snippets_path(project)
-
-        expect(page).to have_selector('.snippet-row', count: 2)
-
-        expect(page).to have_content(snippets[0].title)
-        expect(page).to have_content(snippets[1].title)
-      end
-    end
-
-    context 'when submitting a note' do
-      before do
-        sign_in(create(:admin))
-        visit project_snippet_path(project, snippets[0])
-      end
-
-      it 'should have autocomplete' do
-        find('#note_note').native.send_keys('')
-        fill_in 'note[note]', with: '@'
-
-        expect(page).to have_selector('.atwho-view')
-      end
-
-      it 'should have zen mode' do
-        find('.js-zen-enter').click()
-        expect(page).to have_selector('.fullscreen')
-      end
-    end
-  end
-end
diff --git a/spec/features/projects/user_sees_sidebar_spec.rb b/spec/features/projects/user_sees_sidebar_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..cf80517b934e618ff9568d202f1620306f7bbe71
--- /dev/null
+++ b/spec/features/projects/user_sees_sidebar_spec.rb
@@ -0,0 +1,106 @@
+require 'spec_helper'
+
+describe 'Projects > User sees sidebar' do
+  let(:user) { create(:user) }
+  let(:project) { create(:project, :private, public_builds: false, namespace: user.namespace) }
+
+  context 'as owner' do
+    before do
+      sign_in(user)
+    end
+
+    context 'when snippets are disabled' do
+      before do
+        project.project_feature.update_attribute('snippets_access_level', ProjectFeature::DISABLED)
+      end
+
+      it 'does not display a "Snippets" link' do
+        visit project_path(project)
+
+        within('.nav-sidebar') do
+          expect(page).not_to have_content 'Snippets'
+        end
+      end
+    end
+  end
+
+  context 'as guest' do
+    let(:guest) { create(:user) }
+
+    before do
+      project.add_guest(guest)
+
+      sign_in(guest)
+    end
+
+    it 'shows allowed tabs only' do
+      visit project_path(project)
+
+      within('.nav-sidebar') do
+        expect(page).to have_content 'Overview'
+        expect(page).to have_content 'Issues'
+        expect(page).to have_content 'Wiki'
+
+        expect(page).not_to have_content 'Repository'
+        expect(page).not_to have_content 'CI / CD'
+        expect(page).not_to have_content 'Merge Requests'
+      end
+    end
+
+    it 'does not show fork button' do
+      visit project_path(project)
+
+      within('.count-buttons') do
+        expect(page).not_to have_link 'Fork'
+      end
+    end
+
+    it 'does not show clone path' do
+      visit project_path(project)
+
+      within('.project-repo-buttons') do
+        expect(page).not_to have_selector '.project-clone-holder'
+      end
+    end
+
+    describe 'project landing page' do
+      before do
+        project.project_feature.update!(
+          issues_access_level: ProjectFeature::DISABLED,
+          wiki_access_level: ProjectFeature::DISABLED
+        )
+      end
+
+      it 'does not show the project file list landing page' do
+        visit project_path(project)
+
+        expect(page).not_to have_selector '.project-stats'
+        expect(page).not_to have_selector '.project-last-commit'
+        expect(page).not_to have_selector '.project-show-files'
+        expect(page).to have_selector '.project-show-customize_workflow'
+      end
+
+      it 'shows the customize workflow when issues and wiki are disabled' do
+        visit project_path(project)
+
+        expect(page).to have_selector '.project-show-customize_workflow'
+      end
+
+      it 'shows the wiki when enabled' do
+        project.project_feature.update!(wiki_access_level: ProjectFeature::PRIVATE)
+
+        visit project_path(project)
+
+        expect(page).to have_selector '.project-show-wiki'
+      end
+
+      it 'shows the issues when enabled' do
+        project.project_feature.update!(issues_access_level: ProjectFeature::PRIVATE)
+
+        visit project_path(project)
+
+        expect(page).to have_selector '.issues-list'
+      end
+    end
+  end
+end
diff --git a/spec/features/projects/user_transfers_a_project_spec.rb b/spec/features/projects/user_transfers_a_project_spec.rb
deleted file mode 100644
index 78f72b644ff6329b3fb7f8fcfbdb8d6efe9e4fe2..0000000000000000000000000000000000000000
--- a/spec/features/projects/user_transfers_a_project_spec.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-require 'spec_helper'
-
-feature 'User transfers a project', :js do
-  let(:user) { create(:user) }
-  let(:project) { create(:project, :repository, namespace: user.namespace) }
-
-  before do
-    sign_in user
-  end
-
-  def transfer_project(project, group)
-    visit edit_project_path(project)
-
-    page.within('.js-project-transfer-form') do
-      page.find('.select2-container').click
-    end
-
-    page.find("div[role='option']", text: group.full_name).click
-
-    click_button('Transfer project')
-
-    fill_in 'confirm_name_input', with: project.name
-
-    click_button 'Confirm'
-
-    wait_for_requests
-  end
-
-  it 'allows transferring a project to a subgroup of a namespace' do
-    group = create(:group)
-    group.add_owner(user)
-
-    transfer_project(project, group)
-
-    expect(project.reload.namespace).to eq(group)
-  end
-
-  context 'when nested groups are available', :nested_groups do
-    it 'allows transferring a project to a subgroup' do
-      parent = create(:group)
-      parent.add_owner(user)
-      subgroup = create(:group, parent: parent)
-
-      transfer_project(project, subgroup)
-
-      expect(project.reload.namespace).to eq(subgroup)
-    end
-  end
-end