diff options
author | Valery Sizov <vsv2711@gmail.com> | 2014-12-04 14:43:08 +0300 |
---|---|---|
committer | Valery Sizov <vsv2711@gmail.com> | 2014-12-04 16:53:26 +0300 |
commit | f9a730ebb48ffe21c7b80ed4d188e47ec1baa497 (patch) | |
tree | 3c1e4af95ee92b3b235d8bfa94904bafac7b8a27 /spec | |
parent | b56b96d438c92981cd5c0f5e2f4b23d3799a3bd3 (diff) |
fix specs
Diffstat (limited to 'spec')
-rw-r--r-- | spec/helpers/oauth_helper_spec.rb | 23 | ||||
-rw-r--r-- | spec/lib/gitlab/ldap/access_spec.rb | 2 | ||||
-rw-r--r-- | spec/lib/gitlab/ldap/authentication_spec.rb | 2 | ||||
-rw-r--r-- | spec/lib/gitlab/ldap/user_spec.rb | 2 |
4 files changed, 16 insertions, 13 deletions
diff --git a/spec/helpers/oauth_helper_spec.rb b/spec/helpers/oauth_helper_spec.rb index 846e65b54e9..453699136e9 100644 --- a/spec/helpers/oauth_helper_spec.rb +++ b/spec/helpers/oauth_helper_spec.rb @@ -2,16 +2,19 @@ require "spec_helper" describe OauthHelper do describe "additional_providers" do - it 'returns appropriate values' do - [ - [[:twitter, :github], [:twitter, :github]], - [[:ldap_main], []], - [[:twitter, :ldap_main], [:twitter]], - [[], []], - ].each do |couple| - allow(helper).to receive(:enabled_oauth_providers) { couple.first } - additional_providers.should include(*couple.last) - end + it 'returns all enabled providers' do + allow(helper).to receive(:enabled_oauth_providers) { [:twitter, :github] } + helper.additional_providers.should include(*[:twitter, :github]) + end + + it 'does not return ldap provider' do + allow(helper).to receive(:enabled_oauth_providers) { [:twitter, :ldapmain] } + helper.additional_providers.should include(:twitter) + end + + it 'returns empty array' do + allow(helper).to receive(:enabled_oauth_providers) { [] } + helper.additional_providers.should == [] end end end
\ No newline at end of file diff --git a/spec/lib/gitlab/ldap/access_spec.rb b/spec/lib/gitlab/ldap/access_spec.rb index f4d5a927396..4573b8696c4 100644 --- a/spec/lib/gitlab/ldap/access_spec.rb +++ b/spec/lib/gitlab/ldap/access_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' describe Gitlab::LDAP::Access do let(:access) { Gitlab::LDAP::Access.new user } - let(:user) { create(:user, :ldap) } + let(:user) { create(:omniauth_user) } describe :allowed? do subject { access.allowed? } diff --git a/spec/lib/gitlab/ldap/authentication_spec.rb b/spec/lib/gitlab/ldap/authentication_spec.rb index 0eb7c443b8b..11fdf108756 100644 --- a/spec/lib/gitlab/ldap/authentication_spec.rb +++ b/spec/lib/gitlab/ldap/authentication_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' describe Gitlab::LDAP::Authentication do let(:klass) { Gitlab::LDAP::Authentication } - let(:user) { create(:user, :ldap, extern_uid: dn) } + let(:user) { create(:omniauth_user, extern_uid: dn) } let(:dn) { 'uid=john,ou=people,dc=example,dc=com' } let(:login) { 'john' } let(:password) { 'password' } diff --git a/spec/lib/gitlab/ldap/user_spec.rb b/spec/lib/gitlab/ldap/user_spec.rb index 294ee6cbae0..f73884e6441 100644 --- a/spec/lib/gitlab/ldap/user_spec.rb +++ b/spec/lib/gitlab/ldap/user_spec.rb @@ -21,7 +21,7 @@ describe Gitlab::LDAP::User do end it "connects to existing non-ldap user if the email matches" do - existing_user = create(:omniauth_user, email: 'john@example.com') + existing_user = create(:omniauth_user, email: 'john@example.com', provider: "twitter") expect{ gl_user.save }.to_not change{ User.count } existing_user.reload |