diff options
author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2018-08-03 23:52:01 +0300 |
---|---|---|
committer | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2018-08-08 18:28:27 +0300 |
commit | b6ba8cc696a45e58bde24a592a9c315a0eb16744 (patch) | |
tree | 1e04dca8822b719f94a459292cccb5bc699ed696 /spec/helpers | |
parent | 6f21652f0b79a614ad809dc028aaa28aee16732e (diff) |
Add ability suppress the global "You won't be able [use] SSH" message
This fixes gitlab-org/gitlab-ce#49953, as noted in the documentation
this feature is intended to be used when SSH certificates are
enabled. Then this warning becomes not only pointless, but also
misleading.
This builds on top of gitlab-org/gitlab-ce!21009 since both need to
modify the same documentation, which avoids a merge conflict.
See also the gitlab-org/gitlab-ce#49218 issue and associated merge
request.
Diffstat (limited to 'spec/helpers')
-rw-r--r-- | spec/helpers/button_helper_spec.rb | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/spec/helpers/button_helper_spec.rb b/spec/helpers/button_helper_spec.rb index 630f3eff258..0c0a0003231 100644 --- a/spec/helpers/button_helper_spec.rb +++ b/spec/helpers/button_helper_spec.rb @@ -79,6 +79,18 @@ describe ButtonHelper do end end + context 'without an ssh key on the user and user_show_add_ssh_key_message unset' do + before do + stub_application_setting(user_show_add_ssh_key_message: false) + end + + it 'there is no warning on the dropdown description' do + description = element.search('.dropdown-menu-inner-content').first + + expect(description).to be_nil + end + end + context 'with an ssh key on the user' do before do create(:key, user: user) |