Commit 85f3dabe authored by Robert Speicher's avatar Robert Speicher Committed by Rémy Coutable

Merge branch 'hudecof/show-crowd-login-form-when-signin-disabled' into 'master'

Show Crowd login even when sign-in is disabled

Fixes #13176.

See merge request !2749
parent 11b6c8c3
......@@ -8,6 +8,7 @@ v 8.5.1
- Fix a set of small UI glitches in project, profile, and wiki pages
- Issues can now be dragged & dropped into empty milestone lists. This is also
possible with MRs
- Show Crowd login tab when sign in is disabled and Crowd is enabled (Peter Hudec)
- Restrict permissions on public/uploads
- Add when the Builds & Runners API changes got introduced
- Update sentry-raven gem to 0.15.6
......
- page_title "Sign in"
%div
- if signin_enabled? || ldap_enabled?
- if signin_enabled? || ldap_enabled? || crowd_enabled?
= render 'devise/shared/signin_box'
-# Omniauth fits between signin/ldap signin and signup and does not have a surrounding box
......
Feature: Login form
Scenario: I see crowd form
Scenario: I see Crowd form
Given Crowd integration enabled
When I visit sign in page
Then I should see Crowd login form
\ No newline at end of file
Then I should see Crowd login form
Scenario: I see Crowd form when sign-in is disabled
Given Crowd integration enabled
And Sign-in is disabled
When I visit sign in page
Then I should see Crowd login form
......@@ -5,18 +5,18 @@ class Spinach::Features::LoginForm < Spinach::FeatureSteps
include SharedUser
include SharedSearch
step 'Sign-in is disabled' do
allow_any_instance_of(ApplicationHelper).to receive(:signin_enabled?).and_return(false)
end
step 'Crowd integration enabled' do
@providers_orig = Gitlab::OAuth::Provider.providers
@omniauth_conf_orig = Gitlab.config.omniauth.enabled
expect(Gitlab::OAuth::Provider).to receive(:providers).and_return([:crowd])
allow_any_instance_of(ApplicationHelper).to receive(:user_omniauth_authorize_path).and_return(root_path)
expect(Gitlab.config.omniauth).to receive(:enabled).and_return(true)
allow_any_instance_of(ApplicationHelper).to receive(:user_omniauth_authorize_path).and_return(root_path)
end
step 'I should see Crowd login form' do
expect(page).to have_selector '#tab-crowd form'
Gitlab::OAuth::Provider.stub(:providers).and_return(@providers_orig)
Gitlab.config.omniauth.stub(:enabled).and_return(@omniauth_conf_orig)
end
step 'I visit sign in page' do
......
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