Allow passing an adapter to Gitlab::LDAP::Person

5a616649 · Jacob Vosmaer · 50670948 · 5a616649
Commit 5a616649 authored Mar 14, 2014 by Jacob Vosmaer
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

lib/gitlab/ldap/person.rb lib/gitlab/ldap/person.rb +6 -4

No files found.
--- a/lib/gitlab/ldap/person.rb
+++ b/lib/gitlab/ldap/person.rb
 module Gitlab
  module LDAP
    class Person
-      def self.find_by_uid(uid)
-        Gitlab::LDAP::Adapter.new.user(config.uid, uid)
+      def self.find_by_uid(uid, adapter=nil)
+        adapter ||= Gitlab::LDAP::Adapter.new
+        adapter.user(config.uid, uid)
      end

-      def self.find_by_dn(dn)
-        Gitlab::LDAP::Adapter.new.user('dn', dn)
+      def self.find_by_dn(dn, adapter=nil)
+        adapter ||= Gitlab::LDAP::Adapter.new
+        adapter.user('dn', dn)
      end

      def initialize(entry)