Commit db64746a authored by Miguel Rincon's avatar Miguel Rincon

Merge branch 'sh-add-openid-sso-icon' into 'master'

Add OpenID SSO icon

See merge request gitlab-org/gitlab!54026
parents 637a1578 a025cf73
# frozen_string_literal: true
module AuthHelper
PROVIDERS_WITH_ICONS = %w(twitter github gitlab bitbucket google_oauth2 facebook azure_oauth2 authentiq salesforce atlassian_oauth2).freeze
PROVIDERS_WITH_ICONS = %w(twitter github gitlab bitbucket google_oauth2 facebook azure_oauth2 authentiq salesforce atlassian_oauth2 openid_connect).freeze
LDAP_PROVIDER = /\Aldap/.freeze
def ldap_enabled?
......
---
title: Add OpenID SSO icon
merge_request: 54026
author:
type: changed
......@@ -73,12 +73,12 @@ RSpec.describe AuthHelper do
describe 'enabled_button_based_providers' do
before do
allow(helper).to receive(:auth_providers) { [:twitter, :github, :google_oauth2] }
allow(helper).to receive(:auth_providers) { [:twitter, :github, :google_oauth2, :openid_connect] }
end
context 'all providers are enabled to sign in' do
it 'returns all the enabled providers from settings' do
expect(helper.enabled_button_based_providers).to include('twitter', 'github', 'google_oauth2')
expect(helper.enabled_button_based_providers).to include('twitter', 'github', 'google_oauth2', 'openid_connect')
end
it 'puts google and github in the beginning' 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