Fix specs

Signed-off-by: Rémy Coutable <remy@rymai.me>

4 files changed, 9 insertions, 19 deletions

diff --git a/features/project/source/browse_files.feature b/features/project/source/browse_files.feature
index 1e09dbc4c8f..fdffd71de85 100644
--- a/features/project/source/browse_files.feature
+++ b/features/project/source/browse_files.feature
@@ -124,19 +124,6 @@ Feature: Project Source Browse Files
     And I can see the replacement commit message
 
   @javascript
-  Scenario: I can create file in empty repo
-    Given I own an empty project
-    And I visit my empty project page
-    And I create bare repo
-    When I click on "add a file" link
-    And I edit code
-    And I fill the new file name
-    And I fill the commit message
-    And I click on "Commit Changes"
-    Then I am redirected to the new file
-    And I should see its new content
-
-  @javascript
   Scenario: If I enter an illegal file name I see an error message
     Given I click on "New file" link in repo
     And I fill the new file name with an illegal name
diff --git a/features/steps/project/source/browse_files.rb b/features/steps/project/source/browse_files.rb
index 21545eabc34..c26d7a15212 100644
--- a/features/steps/project/source/browse_files.rb
+++ b/features/steps/project/source/browse_files.rb
@@ -282,8 +282,8 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps
     click_link 'Create empty bare repository'
   end
 
-  step 'I click on "add a file" link' do
-    click_link 'adding a README'
+  step 'I click on "README" link' do
+    click_link 'README'
 
     # Remove pre-receive hook so we can push without auth
     FileUtils.rm_f(File.join(@project.repository.path, 'hooks', 'pre-receive'))
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 c0fcfd06932..3d6ffbc4c6b 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,6 +1,6 @@
 require 'spec_helper'
 
-feature 'creates a license file', feature: true, js: true do
+feature 'project owner creates a license file', feature: true, js: true do
   include Select2Helper
 
   let(:project_master) { create(:user) }
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 6c51d00d813..3268e240200 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,17 +1,18 @@
 require 'spec_helper'
 
-feature 'creates a license file in empty project', feature: true, js: true do
+feature 'project owner sees a link to create a license file in empty project', feature: true, js: true do
   include Select2Helper
 
   let(:project_master) { create(:user) }
-  let(:project) { create(:project_empty_repo) }
+  let(:project) { create(:empty_project) }
   background do
     project.team << [project_master, :master]
     login_as(project_master)
-    visit namespace_project_path(project.namespace, project)
   end
 
   scenario 'project master creates a license file from a template' do
+    visit namespace_project_path(project.namespace, project)
+    click_link 'Create empty bare repository'
     click_on 'LICENSE'
 
     expect(current_path).to eq(
@@ -26,6 +27,8 @@ feature 'creates a license file in empty project', feature: true, js: true do
     expect(file_content).to have_content("Copyright (c) 2016 #{project.namespace.human_name}")
 
     fill_in :commit_message, with: 'Add a LICENSE file', visible: true
+    # Remove pre-receive hook so we can push without auth
+    FileUtils.rm_f(File.join(project.repository.path, 'hooks', 'pre-receive'))
     click_button 'Commit Changes'
 
     expect(current_path).to eq(