Add latest changes from gitlab-org/gitlab@15-0-stable-eev15.0.0-rc42

1 files changed, 10 insertions, 0 deletions

diff --git a/spec/helpers/auth_helper_spec.rb b/spec/helpers/auth_helper_spec.rb
index 4bb09699db4..4b0b44d1325 100644
--- a/spec/helpers/auth_helper_spec.rb
+++ b/spec/helpers/auth_helper_spec.rb
@@ -500,6 +500,16 @@ RSpec.describe AuthHelper do
       )
     end
 
+    context 'when SAML is enabled without specifying a strategy class' do
+      before do
+        allow(Gitlab::Auth::OAuth::Provider).to receive(:providers).and_return([:saml])
+      end
+
+      it 'returns the saml provider' do
+        expect(saml_providers).to match_array([:saml])
+      end
+    end
+
     context 'when configuration specifies no provider' do
       before do
         allow(Devise).to receive(:omniauth_providers).and_return([])