1 files changed, 12 insertions, 14 deletions

diff --git a/spec/features/projects/project_settings_spec.rb b/spec/features/projects/project_settings_spec.rb
index baa38ff8cca..6001bcfff0a 100644
--- a/spec/features/projects/project_settings_spec.rb
+++ b/spec/features/projects/project_settings_spec.rb
@@ -1,18 +1,18 @@
 require 'spec_helper'
 
-describe 'Edit Project Settings', feature: true do
+describe 'Edit Project Settings' do
   include Select2Helper
 
   let(:user) { create(:user) }
   let(:project) { create(:empty_project, namespace: user.namespace, path: 'gitlab', name: 'sample') }
 
   before do
-    gitlab_sign_in(user)
+    sign_in(user)
   end
 
   describe 'Project settings section', js: true do
     it 'shows errors for invalid project name' do
-      visit edit_namespace_project_path(project.namespace, project)
+      visit edit_project_path(project)
       fill_in 'project_name_edit', with: 'foo&bar'
       click_button 'Save changes'
       expect(page).to have_field 'project_name_edit', with: 'foo&bar'
@@ -21,7 +21,7 @@ describe 'Edit Project Settings', feature: true do
     end
 
     it 'shows a successful notice when the project is updated' do
-      visit edit_namespace_project_path(project.namespace, project)
+      visit edit_project_path(project)
       fill_in 'project_name_edit', with: 'hello world'
       click_button 'Save changes'
       expect(page).to have_content "Project 'hello world' was successfully updated."
@@ -55,8 +55,7 @@ describe 'Edit Project Settings', feature: true do
     end
 
     context 'when changing project path' do
-      # Not using empty project because we need a repo to exist
-      let(:project) { create(:project, namespace: user.namespace, name: 'gitlabhq') }
+      let(:project) { create(:project, :repository, namespace: user.namespace, name: 'gitlabhq') }
 
       before(:context) do
         TestEnv.clean_test_path
@@ -75,7 +74,7 @@ describe 'Edit Project Settings', feature: true do
       end
 
       specify 'the project is accessible via a redirect from the old path' do
-        old_path = namespace_project_path(project.namespace, project)
+        old_path = project_path(project)
         rename_project(project, path: 'bar')
         new_path = namespace_project_path(project.namespace, 'bar')
         visit old_path
@@ -85,7 +84,7 @@ describe 'Edit Project Settings', feature: true do
 
       context 'and a new project is added with the same path' do
         it 'overrides the redirect' do
-          old_path = namespace_project_path(project.namespace, project)
+          old_path = project_path(project)
           rename_project(project, path: 'bar')
           new_project = create(:empty_project, namespace: user.namespace, path: 'gitlabhq', name: 'quz')
           visit old_path
@@ -97,8 +96,7 @@ describe 'Edit Project Settings', feature: true do
   end
 
   describe 'Transfer project section', js: true do
-    # Not using empty project because we need a repo to exist
-    let!(:project) { create(:project, namespace: user.namespace, name: 'gitlabhq') }
+    let!(:project) { create(:project, :repository, namespace: user.namespace, name: 'gitlabhq') }
     let!(:group) { create(:group) }
 
     before(:context) do
@@ -122,7 +120,7 @@ describe 'Edit Project Settings', feature: true do
     end
 
     specify 'the project is accessible via a redirect from the old path' do
-      old_path = namespace_project_path(project.namespace, project)
+      old_path = project_path(project)
       transfer_project(project, group)
       new_path = namespace_project_path(group, project)
       visit old_path
@@ -132,7 +130,7 @@ describe 'Edit Project Settings', feature: true do
 
     context 'and a new project is added with the same path' do
       it 'overrides the redirect' do
-        old_path = namespace_project_path(project.namespace, project)
+        old_path = project_path(project)
         transfer_project(project, group)
         new_project = create(:empty_project, namespace: user.namespace, path: 'gitlabhq', name: 'quz')
         visit old_path
@@ -144,7 +142,7 @@ describe 'Edit Project Settings', feature: true do
 end
 
 def rename_project(project, name: nil, path: nil)
-  visit edit_namespace_project_path(project.namespace, project)
+  visit edit_project_path(project)
   fill_in('project_name', with: name) if name
   fill_in('Path', with: path) if path
   click_button('Rename project')
@@ -153,7 +151,7 @@ def rename_project(project, name: nil, path: nil)
 end
 
 def transfer_project(project, namespace)
-  visit edit_namespace_project_path(project.namespace, project)
+  visit edit_project_path(project)
   select2(namespace.id, from: '#new_namespace_id')
   click_button('Transfer project')
   confirm_transfer_modal