summaryrefslogtreecommitdiff
path: root/spec/controllers
diff options
context:
space:
mode:
authorJames Edwards-Jones <jedwardsjones@gitlab.com>2018-12-08 14:12:50 +0000
committerJames Edwards-Jones <jedwardsjones@gitlab.com>2019-01-23 19:42:16 +0000
commit104c8b890dbca25a0d08b2567d003f02953a0fc1 (patch)
tree65b834c80c0794e54465f1ec4a8a1f9c682961c8 /spec/controllers
parent768475bd78420b6ca023c1322bc13c336d688056 (diff)
downloadgitlab-ce-104c8b890dbca25a0d08b2567d003f02953a0fc1.tar.gz
Backport EE GroupSAML origin verification changes
Diffstat (limited to 'spec/controllers')
-rw-r--r--spec/controllers/omniauth_callbacks_controller_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/omniauth_callbacks_controller_spec.rb b/spec/controllers/omniauth_callbacks_controller_spec.rb
index 59463462e5a..f995867c5e1 100644
--- a/spec/controllers/omniauth_callbacks_controller_spec.rb
+++ b/spec/controllers/omniauth_callbacks_controller_spec.rb
@@ -170,7 +170,7 @@ describe OmniauthCallbacksController, type: :controller do
before do
stub_omniauth_saml_config({ enabled: true, auto_link_saml_user: true, allow_single_sign_on: ['saml'],
providers: [saml_config] })
- mock_auth_hash('saml', 'my-uid', user.email, mock_saml_response)
+ mock_auth_hash_with_saml_xml('saml', 'my-uid', user.email, mock_saml_response)
request.env["devise.mapping"] = Devise.mappings[:user]
request.env['omniauth.auth'] = Rails.application.env_config['omniauth.auth']
post :saml, params: { SAMLResponse: mock_saml_response }