From 91e112ffe2a2c16b3b5e2cd4ce032cb9fa769660 Mon Sep 17 00:00:00 2001 From: Marin Jankovski Date: Fri, 13 Sep 2013 10:12:42 +0200 Subject: [PATCH 1/2] Replace remote url on selection. --- app/assets/javascripts/project.js.coffee | 1 + app/views/projects/empty.html.haml | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/project.js.coffee b/app/assets/javascripts/project.js.coffee index 780292daa11..83236b34814 100644 --- a/app/assets/javascripts/project.js.coffee +++ b/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', -> diff --git a/app/views/projects/empty.html.haml b/app/views/projects/empty.html.haml index 99e334cc6b8..001857cefda 100644 --- a/app/views/projects/empty.html.haml +++ b/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 -- GitLab From c606df8fdf7ea4601415fb54135f1c53083f9456 Mon Sep 17 00:00:00 2001 From: Marin Jankovski Date: Fri, 13 Sep 2013 11:37:13 +0200 Subject: [PATCH 2/2] Test. --- features/project/create_project.feature | 11 +++++++++++ features/steps/project/create_project.rb | 22 ++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/features/project/create_project.feature b/features/project/create_project.feature index b7cdfdb818e..395a3218b2b 100644 --- a/features/project/create_project.feature +++ b/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 diff --git a/features/steps/project/create_project.rb b/features/steps/project/create_project.rb index 0d9727732c7..b59345e7078 100644 --- a/features/steps/project/create_project.rb +++ b/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 -- GitLab