diff options
| author | Patricio Cano <suprnova32@gmail.com> | 2015-09-16 19:54:18 -0500 |
|---|---|---|
| committer | Patricio Cano <suprnova32@gmail.com> | 2015-09-16 19:54:18 -0500 |
| commit | 1ddefa3beabed00f08c893ca66b9f004e3b4e4df (patch) | |
| tree | 12c0546f4246b8ee5090c32996f3301207bcf93f /spec/lib/gitlab/ldap/user_spec.rb | |
| parent | 1ef2ce95d507c3d21598f26dd8a0e77dfc3c33cf (diff) | |
| parent | cac969229aab74ab5dcd7682c4f1c3a74a17b9d6 (diff) | |
| download | gitlab-ce-1ddefa3beabed00f08c893ca66b9f004e3b4e4df.tar.gz | |
Merge branch 'master' into notification-levels
Diffstat (limited to 'spec/lib/gitlab/ldap/user_spec.rb')
| -rw-r--r-- | spec/lib/gitlab/ldap/user_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/gitlab/ldap/user_spec.rb b/spec/lib/gitlab/ldap/user_spec.rb index 84d9fb54b61..fd2e5f6d0e1 100644 --- a/spec/lib/gitlab/ldap/user_spec.rb +++ b/spec/lib/gitlab/ldap/user_spec.rb @@ -11,7 +11,7 @@ describe Gitlab::LDAP::User do } end let(:auth_hash) do - double(uid: 'my-uid', provider: 'ldapmain', info: double(info)) + OmniAuth::AuthHash.new(uid: 'my-uid', provider: 'ldapmain', info: info) end describe :changed? do |