Add host interface to ldap; updated tests

Dave Sims · Dave Sims · commit 77b42095b956 · 2016-08-04T18:27:27.000-05:00
diff --git a/lib/github/ldap.rb b/lib/github/ldap.rb
@@ -43,6 +43,7 @@ class Ldap
     #
     # Returns the return value of the block.
     def_delegator :@connection, :open
+    def_delegator :@connection, :host
 
     attr_reader :uid, :search_domains, :virtual_attributes,
                 :membership_validator,
diff --git a/lib/github/ldap/user_search/active_directory.rb b/lib/github/ldap/user_search/active_directory.rb
@@ -37,7 +37,7 @@ def self.connection(ldap)
             auth = netldap.instance_variable_get(:@auth)
 
             new({
-              host: ldap.instance_variable_get(:@host),
+              host: ldap.host,
               instrumentation_service: ldap.instrumentation_service,
               port: encryption ? LDAPS_GC_PORT : STANDARD_GC_PORT,
               auth: auth,
diff --git a/test/user_search/active_directory_test.rb b/test/user_search/active_directory_test.rb
@@ -4,7 +4,7 @@
 class GitHubLdapActiveDirectoryUserSearchTests < GitHub::Ldap::Test
 
   def setup
-    @ldap = GitHub::Ldap.new(options)
+    @ldap = GitHub::Ldap.new(options.merge(host: 'ghe.dev'))
     @ad_user_search = GitHub::Ldap::UserSearch::ActiveDirectory.new(@ldap)
   end
 
@@ -33,14 +33,14 @@ def test_searches_with_empty_base_dn
   end
 
   def test_global_catalog_default_settings
-    global_catalog = @ad_user_search.global_catalog_connection
+    global_catalog = GitHub::Ldap::UserSearch::GlobalCatalog.connection(@ldap)
     instrumentation_service = global_catalog.instance_variable_get(:@instrumentation_service)
 
     auth = global_catalog.instance_variable_get(:@auth)
     assert_equal :simple, auth[:method]
     assert_equal "uid=admin,dc=github,dc=com", auth[:username]
     assert_equal "passworD1", auth[:password]
-    assert_equal "127.0.0.1", global_catalog.host
+    assert_equal "ghe.dev", global_catalog.host
     assert_equal 3268, global_catalog.port
     assert_equal "MockInstrumentationService", instrumentation_service.class.name
   end

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@ class Ldap`
`43`	`43`	`#`
`44`	`44`	`# Returns the return value of the block.`
`45`	`45`	`def_delegator :@connection, :open`
	`46`	`+ def_delegator :@connection, :host`
`46`	`47`
`47`	`48`	`attr_reader :uid, :search_domains, :virtual_attributes,`
`48`	`49`	`:membership_validator,`