kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Hide PAT creation advice for HTTP clone if PAT exist

Browse source 
If the user has a active Personal Access Token, hide the help text that
appears when selecting the link for HTTP clone
This commit is contained in:
George Thomas 2018-08-27 20:35:38 +05:30
parent 472f2d5666
commit 9dcbeca889
No known key found for this signature in database
GPG key ID: A2F9815E085D444D
3 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/helpers/button_helper.rb
View file

@ -67,7 +67,7 @@ module ButtonHelper
def http_dropdown_description(protocol)
if current_user.try(:require_password_creation_for_git?)
_("Set a password on your account to pull or push via %{protocol}.") % { protocol: protocol }
else
elsif current_user.try(:require_personal_access_token_creation_for_git_auth?)
_("Create a personal access token on your account to pull or push via %{protocol}.") % { protocol: protocol }
end
end

5
changelogs/unreleased/fix-download-dropdown-link.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Hide PAT creation advice for HTTP clone if PAT exists
merge_request: 18208
author: George Thomas @thegeorgeous
type: fixed

14
spec/helpers/button_helper_spec.rb
View file

@ -40,12 +40,24 @@ describe ButtonHelper do
end
context 'when user has no personal access tokens' do
it 'has a personal access token text on the dropdown description ' do
it 'has a personal access token text on the dropdown description' do
description = element.search('.dropdown-menu-inner-content').first
expect(description.inner_text).to eq 'Create a personal access token on your account to pull or push via HTTP.'
end
end
context 'when user has personal access tokens' do
before do
create(:personal_access_token, user: user)
end
it 'does not have a personal access token text on the dropdown description' do
description = element.search('.dropdown-menu-inner-content').first
expect(description).to be_nil
end
end
end
context 'when user is ldap user' do