Hardcode server options

mtodd · mtodd · commit d2065f7ae6d3 · 2014-10-05T18:58:30.000-07:00
This is to reduce the variations each test creates, so all tests
can pass with the same settings, fixtures.
diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -29,10 +29,18 @@ def self.stop_server
     end
   end
 
+  def self.test_server_options
+    {
+      custom_schemas:   FIXTURES.join('posixGroup.schema.ldif').to_s,
+      user_fixtures:    FIXTURES.join('common/seed.ldif').to_s,
+      allow_anonymous:  true,
+      verbose:          ENV.fetch("VERBOSE", "0") == "1"
+    }
+  end
+
   def self.start_server
     if test_env == "apacheds"
-      server_opts = respond_to?(:test_server_options) ? test_server_options : {}
-      GitHub::Ldap.start_server(server_opts)
+      GitHub::Ldap.start_server(test_server_options)
     end
   end
 
@@ -42,6 +50,8 @@ def options
       case self.class.test_env
       when "apacheds"
         GitHub::Ldap.server_options.merge \
+          admin_user: 'uid=admin,dc=github,dc=com',
+          admin_password: 'passworD1',
           host: 'localhost',
           uid:  'uid',
           instrumentation_service: @service
@@ -60,12 +70,6 @@ def options
 end
 
 class GitHub::Ldap::UnauthenticatedTest < GitHub::Ldap::Test
-  def self.start_server
-    if test_env == "apacheds"
-      GitHub::Ldap.start_server(:allow_anonymous => true)
-    end
-  end
-
   def options
     @options ||= begin
       super.delete_if {|k, _| [:admin_user, :admin_password].include?(k)}
