github · mtodd · Jun 1, 2021 · May 13, 2021 · Jun 1, 2021 · Jun 1, 2021
diff --git a/.travis.yml b/.travis.yml
@@ -13,6 +13,10 @@ addons:
     - ad1.ghe.dev
     - ad2.ghe.dev
 
+before_install:
+  - echo "deb http://ftp.br.debian.org/debian stable main" | sudo tee -a /etc/apt/sources.list
+  - sudo apt-get update
+
 install:
   - if [ "$TESTENV" = "openldap" ]; then ./script/install-openldap; fi
   - bundle install

diff --git a/github-ldap.gemspec b/github-ldap.gemspec
@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'net-ldap', '~> 0.16.0'
+  spec.add_dependency 'net-ldap', '> 0.16.0'
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency 'ladle'

diff --git a/lib/github/ldap.rb b/lib/github/ldap.rb
@@ -228,7 +228,7 @@ def capabilities
         instrument "capabilities.github_ldap" do |payload|
           begin
             @connection.search_root_dse
-          rescue Net::LDAP::LdapError => error
+          rescue Net::LDAP::Error => error
             payload[:error] = error
             # stubbed result
             Net::LDAP::Entry.new

diff --git a/script/install-openldap b/script/install-openldap
@@ -13,10 +13,8 @@ TMPDIR=$(mktemp -d)
 cd $TMPDIR
 
 # Delete data and reconfigure.
-sudo cp -v /var/lib/ldap/DB_CONFIG ./DB_CONFIG
 sudo rm -rf /etc/ldap/slapd.d/*
 sudo rm -rf /var/lib/ldap/*
-sudo cp -v ./DB_CONFIG /var/lib/ldap/DB_CONFIG
 sudo slapadd -F /etc/ldap/slapd.d -b "cn=config" -l $BASE_PATH/slapd.conf.ldif
 # Load memberof and ref-int overlays and configure them.
 sudo slapadd -F /etc/ldap/slapd.d -b "cn=config" -l $BASE_PATH/memberof.ldif

diff --git a/test/domain_test.rb b/test/domain_test.rb
@@ -236,7 +236,8 @@ def test_membership_for_posixGroups
 
 class GitHubLdapActiveDirectoryGroupsTest < GitHub::Ldap::Test
   def run(*)
-    self.class.test_env == "activedirectory" ? super : self
+    return super if self.class.test_env == "activedirectory"
+    Minitest::Result.from(self)
   end
 
   def test_filter_groups

diff --git a/test/member_search/active_directory_test.rb b/test/member_search/active_directory_test.rb
@@ -3,7 +3,8 @@
 class GitHubLdapActiveDirectoryMemberSearchStubbedTest < GitHub::Ldap::Test
   # Only run when AD integration tests aren't run
   def run(*)
-    self.class.test_env != "activedirectory" ? super : self
+    return super if self.class.test_env != "activedirectory"
+    Minitest::Result.from(self)
   end
 
   def find_group(cn)
@@ -46,7 +47,8 @@ def test_finds_deeply_nested_group_members
 class GitHubLdapActiveDirectoryMemberSearchIntegrationTest < GitHub::Ldap::Test
   # Only run this test suite if ActiveDirectory is configured
   def run(*)
-    self.class.test_env == "activedirectory" ? super : self
+    return super if self.class.test_env == "activedirectory"
+    Minitest::Result.from(self)
   end
 
   def find_group(cn)

diff --git a/test/membership_validators/active_directory_test.rb b/test/membership_validators/active_directory_test.rb
@@ -3,7 +3,8 @@
 class GitHubLdapActiveDirectoryMembershipValidatorsStubbedTest < GitHub::Ldap::Test
   # Only run when AD integration tests aren't run
   def run(*)
-    self.class.test_env != "activedirectory" ? super : self
+    return super if self.class.test_env != "activedirectory"
+    Minitest::Result.from(self)
   end
 
   def setup
@@ -72,7 +73,8 @@ def test_does_not_validate_user_not_in_any_group
 class GitHubLdapActiveDirectoryMembershipValidatorsIntegrationTest < GitHub::Ldap::Test
   # Only run this test suite if ActiveDirectory is configured
   def run(*)
-    self.class.test_env == "activedirectory" ? super : self
+    return super if self.class.test_env == "activedirectory"
+    Minitest::Result.from(self)
   end
 
   def setup

diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -13,7 +13,7 @@
 require 'minitest/mock'
 require 'minitest/autorun'
 
-require 'mocha/mini_test'
+require 'mocha/minitest'
 
 if ENV.fetch('TESTENV', "apacheds") == "apacheds"
   # Make sure we clean up running test server
@@ -31,8 +31,9 @@ def self.test_env
 
   def self.run(reporter, options = {})
     start_server
-    super
+    result = super
     stop_server
+    result
   end
 
   def self.stop_server

diff --git a/test/user_search/active_directory_test.rb b/test/user_search/active_directory_test.rb
@@ -20,7 +20,7 @@ def test_global_catalog_returns_array_of_results
     mock_global_catalog_connection = mock("GitHub::Ldap::UserSearch::GlobalCatalog")
     stub_entry = mock("Net::LDAP::Entry")
 
-    mock_global_catalog_connection.expects(:search).returns(stub_entry)
+    mock_global_catalog_connection.expects(:search).returns([stub_entry])
     ad_user_search.expects(:global_catalog_connection).returns(mock_global_catalog_connection)
 
     results = ad_user_search.perform("login", "CN=Joe", "uid", {})