Merge branch 'init-from-ui' into 'master'

app/views/projects/empty.html.haml

@@ -6,7 +6,7 @@
 .center.well
   %h3
     The repository for this project is empty
-  %p.lead
+  %h4
     You can
     = link_to project_new_blob_path(@project, 'master'), class: 'btn btn-new btn-lg' do
       add a file

features/project/source/browse_files.feature

@@ -35,6 +35,19 @@ Feature: Project Source Browse Files
     And I should see its new content
 
   @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

features/steps/project/source/browse_files.rb

@@ -166,6 +166,17 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps
     expect(page).to have_content('Your changes could not be committed')
   end
 
+  step 'I create bare repo' do
+    click_link 'Create empty bare repository'
+  end
+
+  step 'I click on "add a file" link' do
+    click_link 'add a file'
+
+    # Remove pre-receive hook so we can push without auth
+    FileUtils.rm(File.join(Project.last.repository.path, 'hooks', 'pre-receive'))
+  end
+
   private
 
   def set_new_content

features/steps/shared/project.rb

@@ -28,6 +28,10 @@ module SharedProject
     @project.team << [@user, :master]
   end
 
+  step 'I visit my empty project page' do
+    visit project_path(Project.find_by(name: 'Empty Project'))
+  end
+
   step 'project "Shop" has push event' do
     @project = Project.find_by(name: "Shop")