summaryrefslogtreecommitdiff
path: root/spec/lib/gitlab/o_auth
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-09-08 10:58:48 +0100
committerDouwe Maan <douwe@gitlab.com>2015-09-08 16:18:14 +0100
commitc915e2c8237ddcae57ec48e700badd9d5bfd8c8c (patch)
tree045b66c46a9af2022734ccf390ccd979f2ddb07a /spec/lib/gitlab/o_auth
parente0da2c352325c1cb2ede88a73434ed7afc037481 (diff)
downloadgitlab-ce-c915e2c8237ddcae57ec48e700badd9d5bfd8c8c.tar.gz
Allow configuration of LDAP attributes GitLab will use for the new user account.
Diffstat (limited to 'spec/lib/gitlab/o_auth')
-rw-r--r--spec/lib/gitlab/o_auth/auth_hash_spec.rb6
-rw-r--r--spec/lib/gitlab/o_auth/user_spec.rb2
2 files changed, 4 insertions, 4 deletions
diff --git a/spec/lib/gitlab/o_auth/auth_hash_spec.rb b/spec/lib/gitlab/o_auth/auth_hash_spec.rb
index e4a6cd954cc..5632f2306ec 100644
--- a/spec/lib/gitlab/o_auth/auth_hash_spec.rb
+++ b/spec/lib/gitlab/o_auth/auth_hash_spec.rb
@@ -3,11 +3,11 @@ require 'spec_helper'
describe Gitlab::OAuth::AuthHash do
let(:auth_hash) do
Gitlab::OAuth::AuthHash.new(
- double({
+ OmniAuth::AuthHash.new(
provider: provider_ascii,
uid: uid_ascii,
- info: double(info_hash)
- })
+ info: info_hash
+ )
)
end
diff --git a/spec/lib/gitlab/o_auth/user_spec.rb b/spec/lib/gitlab/o_auth/user_spec.rb
index c6cca98a037..c0083fc85be 100644
--- a/spec/lib/gitlab/o_auth/user_spec.rb
+++ b/spec/lib/gitlab/o_auth/user_spec.rb
@@ -5,7 +5,7 @@ describe Gitlab::OAuth::User do
let(:gl_user) { oauth_user.gl_user }
let(:uid) { 'my-uid' }
let(:provider) { 'my-provider' }
- let(:auth_hash) { double(uid: uid, provider: provider, info: double(info_hash)) }
+ let(:auth_hash) { OmniAuth::AuthHash.new(uid: uid, provider: provider, info: info_hash) }
let(:info_hash) do
{
nickname: '-john+gitlab-ETC%.git@gmail.com',