diff options
author | Douwe Maan <douwe@gitlab.com> | 2017-06-28 14:59:43 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2017-06-28 14:59:43 +0000 |
commit | 4970a66b24b3c465984c4e5f1aa49d60e7c587e4 (patch) | |
tree | b0fd9f91a1e66cc5efb14d5a71cbd00bcfd53d38 | |
parent | fb093e8b2e0057c1a0da541fc228f19507a7d4b8 (diff) | |
parent | d2eb5bbd9cf194a67624044ee3cabc1280f33f4e (diff) | |
download | gitlab-ce-4970a66b24b3c465984c4e5f1aa49d60e7c587e4.tar.gz |
Merge branch 'bvl-fix-ldap-login' into 'master'
Fix setting `last_credential_check_at` on LDAP-login
See merge request !12507
-rw-r--r-- | lib/gitlab/ldap/access.rb | 2 | ||||
-rw-r--r-- | spec/lib/gitlab/ldap/access_spec.rb | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/lib/gitlab/ldap/access.rb b/lib/gitlab/ldap/access.rb index 8779577258b..fb68627dedf 100644 --- a/lib/gitlab/ldap/access.rb +++ b/lib/gitlab/ldap/access.rb @@ -16,7 +16,7 @@ module Gitlab def self.allowed?(user) self.open(user) do |access| if access.allowed? - Users::UpdateService.new(user, last_credential_check_a: Time.now).execute + Users::UpdateService.new(user, last_credential_check_at: Time.now).execute true else diff --git a/spec/lib/gitlab/ldap/access_spec.rb b/spec/lib/gitlab/ldap/access_spec.rb index 9dd997aa7dc..756fcb0fcaf 100644 --- a/spec/lib/gitlab/ldap/access_spec.rb +++ b/spec/lib/gitlab/ldap/access_spec.rb @@ -4,6 +4,16 @@ describe Gitlab::LDAP::Access, lib: true do let(:access) { Gitlab::LDAP::Access.new user } let(:user) { create(:omniauth_user) } + describe '.allowed?' do + it 'updates the users `last_credential_check_at' do + expect(access).to receive(:allowed?) { true } + expect(described_class).to receive(:open).and_yield(access) + + expect { described_class.allowed?(user) } + .to change { user.last_credential_check_at } + end + end + describe '#allowed?' do subject { access.allowed? } |