Merge branch 'remote_url_in_project_blank_slate' of /home/git/repositories/gitlab/gitlabhq

app/assets/javascripts/project.js.coffee

@@ -35,6 +35,7 @@ $ ->
       $('a, button', scope).removeClass 'active'
       $(@).addClass 'active'
       $('#project_clone', scope).val $(@).data 'clone'
+      $(".clone").text("").append 'git remote add origin ' + $(@).data 'clone'
 
   # Ref switcher
   $('.project-refs-select').on 'change', ->

app/views/projects/empty.html.haml

@@ -29,7 +29,8 @@
           touch README
           git add README
           git commit -m 'first commit'
-          git remote add origin #{@project.url_to_repo}
+        %span.clone= "git remote add origin #{@project.url_to_repo}"
+        :preserve
           git push -u origin master
 
     %fieldset
@@ -37,7 +38,8 @@
       %pre.dark
         :preserve
           cd existing_git_repo
-          git remote add origin #{@project.url_to_repo}
+        %span.clone= "git remote add origin #{@project.url_to_repo}"
+        :preserve
           git push -u origin master
 
   - if can? current_user, :remove_project, @project

features/project/create_project.feature

@@ -9,3 +9,14 @@ Feature: Create Project
     And fill project form with valid data
     Then I should see project page
     And I should see empty project instuctions
+
+  @javascript
+  Scenario: Empty project instructions
+    Given I sign in as a user
+    When I visit new project page
+    And fill project form with valid data
+    Then I see empty project instuctions
+    And I click on HTTP
+    Then Remote url should update to http link
+    And If I click on SSH
+    Then Remote url should update to ssh link
\ No newline at end of file

features/steps/project/create_project.rb

@@ -17,4 +17,26 @@ class CreateProject < Spinach::FeatureSteps
     page.should have_content "git remote"
     page.should have_content Project.last.url_to_repo
   end
+
+  Then 'I see empty project instuctions' do
+    page.should have_content "git init"
+    page.should have_content "git remote"
+    page.should have_content Project.last.url_to_repo
+  end
+
+  And 'I click on HTTP' do
+    click_button 'HTTP'
+  end
+
+  Then 'Remote url should update to http link' do
+    page.should have_content "git remote add origin #{Project.last.http_url_to_repo}"
+  end
+
+  And 'If I click on SSH' do
+    click_button 'SSH'
+  end
+
+  Then 'Remote url should update to ssh link' do
+    page.should have_content "git remote add origin #{Project.last.url_to_repo}"
+  end
 end