Make sure global catalog search returns first entry from result array

Dave Sims · Dave Sims · commit 3af0a8856112 · 2016-07-25T13:59:10.000-05:00
diff --git a/lib/github/ldap/domain.rb b/lib/github/ldap/domain.rb
@@ -122,8 +122,7 @@ def user?(login, search_options = {})
         if @ldap.active_directory_capability?
           # when doing a global search for a user's DN, set the search base to blank
           options[:base] = ""
-          @ldap.global_catalog_search(options)
-
+          @ldap.global_catalog_search(options).first
         else
           search(options).first
         end
diff --git a/test/domain_test.rb b/test/domain_test.rb
@@ -148,6 +148,14 @@ def test_use_global_catalog_if_active_directory
     @domain.user?('user1', :attributes => [:cn])
   end
 
+  def test_global_catalog_search_returns_first_entry
+    @ldap.stubs(:active_directory_capability?).returns(true)
+    entry = Object.new
+    @ldap.expects(:global_catalog_search).returns([entry])
+    user = @domain.user?('user1', :attributes => [:cn])
+    assert_equal entry, user
+  end
+
   def test_global_catalog_has_empty_search_base
     @ldap.stubs(:active_directory_capability?).returns(true)
     @ldap.expects(:global_catalog_search).with(has_entry(:base => "")).returns([])
