Commit 2b4509c4 authored by Douwe Maan's avatar Douwe Maan

Merge branch 'DustinU/fix/sign-in-button-text-48917' into 'master'

Show "Sign in" instead of "Sign in / Register" when sign up is disabled

See merge request gitlab-org/gitlab-ce!20474
parents 9a9b4444 1da22cec
...@@ -61,7 +61,9 @@ ...@@ -61,7 +61,9 @@
- if header_link?(:sign_in) - if header_link?(:sign_in)
%li.nav-item %li.nav-item
%div %div
= link_to "Sign in / Register", new_session_path(:user, redirect_to_referer: 'yes'), class: 'btn btn-sign-in' - sign_in_text = allow_signup? ? 'Sign in / Register' : 'Sign in'
= link_to sign_in_text, new_session_path(:user, redirect_to_referer: 'yes'), class: 'btn btn-sign-in'
%button.navbar-toggler.d-block.d-sm-none{ type: 'button' } %button.navbar-toggler.d-block.d-sm-none{ type: 'button' }
%span.sr-only Toggle navigation %span.sr-only Toggle navigation
......
...@@ -14,4 +14,28 @@ describe 'User page' do ...@@ -14,4 +14,28 @@ describe 'User page' do
expect(page).to have_link('Snippets') expect(page).to have_link('Snippets')
end end
end end
context 'signup disabled' do
it 'shows the sign in link' do
stub_application_setting(signup_enabled: false)
visit(user_path(user))
page.within '.navbar-nav' do
expect(page).to have_link('Sign in')
end
end
end
context 'signup enabled' do
it 'shows the sign in and register link' do
stub_application_setting(signup_enabled: true)
visit(user_path(user))
page.within '.navbar-nav' do
expect(page).to have_link('Sign in / Register')
end
end
end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment