summaryrefslogtreecommitdiff
path: root/spec/lib/gitlab/oauth
diff options
context:
space:
mode:
authorValery Sizov <vsv2711@gmail.com>2014-11-27 13:34:39 +0200
committerValery Sizov <vsv2711@gmail.com>2014-12-04 13:03:55 +0200
commit3a5ed5260b24051939575d1934ce9b8392cac09f (patch)
tree04d361e52d16234f00e5cdd27b5ebfef9a503579 /spec/lib/gitlab/oauth
parent1a80d13a3990937580c97e2b0ba8fb98f69bc055 (diff)
downloadgitlab-ce-3a5ed5260b24051939575d1934ce9b8392cac09f.tar.gz
Supporting for multiple omniauth provider for the same user
Diffstat (limited to 'spec/lib/gitlab/oauth')
-rw-r--r--spec/lib/gitlab/oauth/user_spec.rb7
1 files changed, 4 insertions, 3 deletions
diff --git a/spec/lib/gitlab/oauth/user_spec.rb b/spec/lib/gitlab/oauth/user_spec.rb
index 8a83a1b2588..88307515789 100644
--- a/spec/lib/gitlab/oauth/user_spec.rb
+++ b/spec/lib/gitlab/oauth/user_spec.rb
@@ -15,7 +15,7 @@ describe Gitlab::OAuth::User do
end
describe :persisted? do
- let!(:existing_user) { create(:user, extern_uid: 'my-uid', provider: 'my-provider') }
+ let!(:existing_user) { create(:omniauth_user, extern_uid: 'my-uid', provider: 'my-provider') }
it "finds an existing user based on uid and provider (facebook)" do
auth = double(info: double(name: 'John'), uid: 'my-uid', provider: 'my-provider')
@@ -39,8 +39,9 @@ describe Gitlab::OAuth::User do
oauth_user.save
expect(gl_user).to be_valid
- expect(gl_user.extern_uid).to eql uid
- expect(gl_user.provider).to eql 'twitter'
+ identity = gl_user.identities.first
+ expect(identity.extern_uid).to eql uid
+ expect(identity.provider).to eql 'twitter'
end
end