diff options
author | Douwe Maan <douwe@selenight.nl> | 2016-02-18 22:14:53 +0100 |
---|---|---|
committer | Douwe Maan <douwe@selenight.nl> | 2016-02-18 22:14:53 +0100 |
commit | 873b0db220b92008ed833f0909ecab8861bf00e8 (patch) | |
tree | b84cb7114af9a4f5c30a8e19342a32e7ec18e42b /spec/lib/gitlab/o_auth | |
parent | 6524fbeaba7c16ae8ca514c7540a1aa6e86f4129 (diff) | |
download | gitlab-ce-873b0db220b92008ed833f0909ecab8861bf00e8.tar.gz |
Revert "Merge branch 'saml-decoupling' into 'master'
"
This reverts commit c04e22fba8d130a58f498ff48127712d7dae17ee, reversing
changes made to 0feab326d52222dc0ab5bd0a6b15dab297f44aa9.
Diffstat (limited to 'spec/lib/gitlab/o_auth')
-rw-r--r-- | spec/lib/gitlab/o_auth/user_spec.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/lib/gitlab/o_auth/user_spec.rb b/spec/lib/gitlab/o_auth/user_spec.rb index 76b1360f208..925bc442a90 100644 --- a/spec/lib/gitlab/o_auth/user_spec.rb +++ b/spec/lib/gitlab/o_auth/user_spec.rb @@ -42,7 +42,7 @@ describe Gitlab::OAuth::User, lib: true do describe 'signup' do shared_examples "to verify compliance with allow_single_sign_on" do context "with allow_single_sign_on enabled" do - before { stub_omniauth_config(allow_single_sign_on: ['twitter']) } + before { stub_omniauth_config(allow_single_sign_on: true) } it "creates a user from Omniauth" do oauth_user.save @@ -55,7 +55,7 @@ describe Gitlab::OAuth::User, lib: true do end context "with allow_single_sign_on disabled (Default)" do - before { stub_omniauth_config(allow_single_sign_on: []) } + before { stub_omniauth_config(allow_single_sign_on: false) } it "throws an error" do expect{ oauth_user.save }.to raise_error StandardError end @@ -135,7 +135,7 @@ describe Gitlab::OAuth::User, lib: true do describe 'blocking' do let(:provider) { 'twitter' } - before { stub_omniauth_config(allow_single_sign_on: ['twitter']) } + before { stub_omniauth_config(allow_single_sign_on: true) } context 'signup with omniauth only' do context 'dont block on create' do |