summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorConnor Shea <connor.james.shea@gmail.com>2016-07-25 11:40:40 -0600
committerConnor Shea <connor.james.shea@gmail.com>2016-08-03 11:50:38 -0600
commit602fe111912bac119e752b0dfa3b4b3cd81585ff (patch)
tree7f39c59bb7ca285482bc9c57450394910dc761c3 /spec
parente8c6f119cd7cf519db3ad1622786aad3156324d4 (diff)
downloadgitlab-ce-602fe111912bac119e752b0dfa3b4b3cd81585ff.tar.gz
Remove provider path, replace with dynamic path.devise-deprecations
Diffstat (limited to 'spec')
-rw-r--r--spec/features/login_spec.rb2
-rw-r--r--spec/views/devise/shared/_signin_box.html.haml_spec.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/features/login_spec.rb b/spec/features/login_spec.rb
index 58753ff21f6..c4e8b1da531 100644
--- a/spec/features/login_spec.rb
+++ b/spec/features/login_spec.rb
@@ -128,7 +128,7 @@ feature 'Login', feature: true do
end
allow(Gitlab::OAuth::Provider).to receive_messages(providers: [:saml], config_for: saml_config)
allow(Gitlab.config.omniauth).to receive_messages(messages)
- allow_any_instance_of(Object).to receive(:user_omniauth_authorize_path).with('saml').and_return('/users/auth/saml')
+ expect_any_instance_of(Object).to receive(:omniauth_authorize_path).with(:user, "saml").and_return('/users/auth/saml')
end
it 'should show 2FA prompt after OAuth login' do
diff --git a/spec/views/devise/shared/_signin_box.html.haml_spec.rb b/spec/views/devise/shared/_signin_box.html.haml_spec.rb
index 05a76ee4bdb..ee362e6fcb3 100644
--- a/spec/views/devise/shared/_signin_box.html.haml_spec.rb
+++ b/spec/views/devise/shared/_signin_box.html.haml_spec.rb
@@ -31,7 +31,7 @@ describe 'devise/shared/_signin_box' do
def enable_crowd
allow(view).to receive(:form_based_providers).and_return([:crowd])
allow(view).to receive(:crowd_enabled?).and_return(true)
- allow(view).to receive(:user_omniauth_authorize_path).with('crowd').
+ allow(view).to receive(:omniauth_authorize_path).with(:user, :crowd).
and_return('/crowd')
end
end