Merge branch 'fix-download-dropdown-link' into 'master'

Hide PAT creation advice for HTTP clone if PAT exists

Closes #44111

See merge request gitlab-org/gitlab-ce!18208
This commit is contained in:
Nick Thomas 2018-09-03 11:06:26 +00:00
commit 0e05e3a0ff
3 changed files with 19 additions and 2 deletions

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

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

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