From 5907207e4ddb85fff997ad243f6be7486800eceb Mon Sep 17 00:00:00 2001 From: Steven Thonus Date: Thu, 28 Nov 2013 22:46:55 +0100 Subject: [PATCH] showing as default http link for public repo when anonymous --- app/views/shared/_clone_panel.html.haml | 6 +++--- features/public/public_projects.feature | 11 +++++++++++ features/steps/public/projects_feature.rb | 10 ++++++++++ 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/app/views/shared/_clone_panel.html.haml b/app/views/shared/_clone_panel.html.haml index ac7b9ee7f2d..097c81100ba 100644 --- a/app/views/shared/_clone_panel.html.haml +++ b/app/views/shared/_clone_panel.html.haml @@ -1,4 +1,4 @@ .git-clone-holder - %button{class: "btn active", :"data-clone" => @project.ssh_url_to_repo} SSH - %button{class: "btn", :"data-clone" => @project.http_url_to_repo}= gitlab_config.protocol.upcase - = text_field_tag :project_clone, @project.url_to_repo, class: "one_click_select span5", readonly: true + %button{class: "btn #{ current_user ? 'active' : '' }", :"data-clone" => @project.ssh_url_to_repo} SSH + %button{class: "btn #{ current_user ? '' : 'active' }", :"data-clone" => @project.http_url_to_repo}= gitlab_config.protocol.upcase + = text_field_tag :project_clone, (current_user ? @project.url_to_repo : @project.http_url_to_repo), class: "one_click_select span5", readonly: true diff --git a/features/public/public_projects.feature b/features/public/public_projects.feature index 86bb888fdb6..03825dffd3f 100644 --- a/features/public/public_projects.feature +++ b/features/public/public_projects.feature @@ -38,3 +38,14 @@ Feature: Public Projects Feature Given I sign in as a user When I visit project "Internal" page Then I should see project "Internal" home page + + Scenario: I visit public project page + When I visit project "Community" page + Then I should see project "Community" home page + And I should see a http link to the repository + + Scenario: I visit public area as user + Given I sign in as a user + When I visit project "Community" page + Then I should see project "Community" home page + And I should see a ssh link to the repository diff --git a/features/steps/public/projects_feature.rb b/features/steps/public/projects_feature.rb index 8b61eba3ffb..a4209bb9c78 100644 --- a/features/steps/public/projects_feature.rb +++ b/features/steps/public/projects_feature.rb @@ -83,5 +83,15 @@ class Spinach::Features::PublicProjectsFeature < Spinach::FeatureSteps page.should have_content 'Internal' end end + + Then 'I should see a http link to the repository' do + project = Project.find_by_name 'Community' + page.should have_field('project_clone', with: project.http_url_to_repo) + end + + Then 'I should see a ssh link to the repository' do + project = Project.find_by_name 'Community' + page.should have_field('project_clone', with: project.url_to_repo) + end end