summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Van Landuyt <bob@vanlanduyt.co>2017-06-28 09:30:18 +0200
committerBob Van Landuyt <bob@vanlanduyt.co>2017-06-28 09:30:18 +0200
commitd2eb5bbd9cf194a67624044ee3cabc1280f33f4e (patch)
tree38c3bd05f5237a982d18b3c196e2f7bff8fa6ebf
parent08ad0af49c017d740b43588c0809b3811d25a448 (diff)
downloadgitlab-ce-bvl-fix-ldap-login.tar.gz
Fix setting `last_credential_check` on LDAP-loginbvl-fix-ldap-login
-rw-r--r--lib/gitlab/ldap/access.rb2
-rw-r--r--spec/lib/gitlab/ldap/access_spec.rb10
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? }