Commit ca530a9b authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'rs-platform-feature-spec-parity' into 'master'

Make the stubbed methods for SAML authorize paths more specific

See merge request gitlab-org/gitlab-ce!20009
parents 3147efef 73ade323
...@@ -152,8 +152,13 @@ module LoginHelpers ...@@ -152,8 +152,13 @@ module LoginHelpers
end end
def stub_saml_authorize_path_helpers def stub_saml_authorize_path_helpers
allow_any_instance_of(Object).to receive(:user_saml_omniauth_authorize_path).and_return('/users/auth/saml') allow_any_instance_of(ActionDispatch::Routing::RoutesProxy)
allow_any_instance_of(Object).to receive(:omniauth_authorize_path).with(:user, "saml").and_return('/users/auth/saml') .to receive(:user_saml_omniauth_authorize_path)
.and_return('/users/auth/saml')
allow(Devise::OmniAuth::UrlHelpers)
.to receive(:omniauth_authorize_path)
.with(:user, "saml")
.and_return('/users/auth/saml')
end end
def stub_omniauth_config(messages) def stub_omniauth_config(messages)
......
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