From eff30fff08cf7326d4416d1aa6ef00164643cdcb Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 15 Apr 2014 17:27:59 +0300 Subject: [PATCH] Improve dn_matches_filter method Signed-off-by: Dmitriy Zaporozhets --- lib/gitlab/ldap/adapter.rb | 7 +------ spec/lib/gitlab/ldap/ldap_adapter_spec.rb | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/lib/gitlab/ldap/adapter.rb b/lib/gitlab/ldap/adapter.rb index 7c6a095df7..38112b0a5b 100644 --- a/lib/gitlab/ldap/adapter.rb +++ b/lib/gitlab/ldap/adapter.rb @@ -107,12 +107,7 @@ module Gitlab end def dn_matches_filter?(dn, filter) - results = ldap_search(base: dn, filter: filter, attributes: %w{dn}) - if results.blank? - false # Net::LDAP encountered an LDAP error - else - results.any? - end + ldap_search(base: dn, filter: filter, attributes: %w{dn}).any? end def ldap_search(*args) diff --git a/spec/lib/gitlab/ldap/ldap_adapter_spec.rb b/spec/lib/gitlab/ldap/ldap_adapter_spec.rb index a5566723a0..c3f0733443 100644 --- a/spec/lib/gitlab/ldap/ldap_adapter_spec.rb +++ b/spec/lib/gitlab/ldap/ldap_adapter_spec.rb @@ -23,7 +23,7 @@ describe Gitlab::LDAP::Adapter do end context "when the search encounters an error" do - before { ldap.stub(search: nil) } + before { ldap.stub(search: nil, get_operation_result: double(code: 1, message: 'some error')) } it { should be_false } end