Skip to content

Commit 06d2c92

Browse files
mtoddmtodd
authored
Merge pull request #106 from github/loosen-ldap-requirement
Loosen net-ldap requirement this allows for ldap 0.17.0
2 parents 34c2685 + f676fc1 commit 06d2c92

File tree

9 files changed

+20
-12
lines changed

9 files changed

+20
-12
lines changed

‎.travis.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ addons:
1313
- ad1.ghe.dev
1414
- ad2.ghe.dev
1515

16+
before_install:
17+
- echo "deb http://ftp.br.debian.org/debian stable main" | sudo tee -a /etc/apt/sources.list
18+
- sudo apt-get update
19+
1620
install:
1721
- if [ "$TESTENV" = "openldap" ]; then ./script/install-openldap; fi
1822
- bundle install

‎github-ldap.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
1515
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
1616
spec.require_paths = ["lib"]
1717

18-
spec.add_dependency 'net-ldap', '~> 0.16.0'
18+
spec.add_dependency 'net-ldap', '> 0.16.0'
1919

2020
spec.add_development_dependency "bundler", "~> 1.3"
2121
spec.add_development_dependency 'ladle'

‎lib/github/ldap.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ def capabilities
228228
instrument "capabilities.github_ldap" do |payload|
229229
begin
230230
@connection.search_root_dse
231-
rescue Net::LDAP::LdapError => error
231+
rescue Net::LDAP::Error => error
232232
payload[:error] = error
233233
# stubbed result
234234
Net::LDAP::Entry.new

‎script/install-openldap

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,8 @@ TMPDIR=$(mktemp -d)
1313
cd $TMPDIR
1414

1515
# Delete data and reconfigure.
16-
sudo cp -v /var/lib/ldap/DB_CONFIG ./DB_CONFIG
1716
sudo rm -rf /etc/ldap/slapd.d/*
1817
sudo rm -rf /var/lib/ldap/*
19-
sudo cp -v ./DB_CONFIG /var/lib/ldap/DB_CONFIG
2018
sudo slapadd -F /etc/ldap/slapd.d -b "cn=config" -l $BASE_PATH/slapd.conf.ldif
2119
# Load memberof and ref-int overlays and configure them.
2220
sudo slapadd -F /etc/ldap/slapd.d -b "cn=config" -l $BASE_PATH/memberof.ldif

‎test/domain_test.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,8 @@ def test_membership_for_posixGroups
236236

237237
class GitHubLdapActiveDirectoryGroupsTest < GitHub::Ldap::Test
238238
def run(*)
239-
self.class.test_env == "activedirectory" ? super : self
239+
return super if self.class.test_env == "activedirectory"
240+
Minitest::Result.from(self)
240241
end
241242

242243
def test_filter_groups

‎test/member_search/active_directory_test.rb

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
class GitHubLdapActiveDirectoryMemberSearchStubbedTest < GitHub::Ldap::Test
44
# Only run when AD integration tests aren't run
55
def run(*)
6-
self.class.test_env != "activedirectory" ? super : self
6+
return super if self.class.test_env != "activedirectory"
7+
Minitest::Result.from(self)
78
end
89

910
def find_group(cn)
@@ -46,7 +47,8 @@ def test_finds_deeply_nested_group_members
4647
class GitHubLdapActiveDirectoryMemberSearchIntegrationTest < GitHub::Ldap::Test
4748
# Only run this test suite if ActiveDirectory is configured
4849
def run(*)
49-
self.class.test_env == "activedirectory" ? super : self
50+
return super if self.class.test_env == "activedirectory"
51+
Minitest::Result.from(self)
5052
end
5153

5254
def find_group(cn)

‎test/membership_validators/active_directory_test.rb

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
class GitHubLdapActiveDirectoryMembershipValidatorsStubbedTest < GitHub::Ldap::Test
44
# Only run when AD integration tests aren't run
55
def run(*)
6-
self.class.test_env != "activedirectory" ? super : self
6+
return super if self.class.test_env != "activedirectory"
7+
Minitest::Result.from(self)
78
end
89

910
def setup
@@ -72,7 +73,8 @@ def test_does_not_validate_user_not_in_any_group
7273
class GitHubLdapActiveDirectoryMembershipValidatorsIntegrationTest < GitHub::Ldap::Test
7374
# Only run this test suite if ActiveDirectory is configured
7475
def run(*)
75-
self.class.test_env == "activedirectory" ? super : self
76+
return super if self.class.test_env == "activedirectory"
77+
Minitest::Result.from(self)
7678
end
7779

7880
def setup

‎test/test_helper.rb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
require 'minitest/mock'
1414
require 'minitest/autorun'
1515

16-
require 'mocha/mini_test'
16+
require 'mocha/minitest'
1717

1818
if ENV.fetch('TESTENV', "apacheds") == "apacheds"
1919
# Make sure we clean up running test server
@@ -31,8 +31,9 @@ def self.test_env
3131

3232
def self.run(reporter, options = {})
3333
start_server
34-
super
34+
result = super
3535
stop_server
36+
result
3637
end
3738

3839
def self.stop_server

‎test/user_search/active_directory_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def test_global_catalog_returns_array_of_results
2020
mock_global_catalog_connection = mock("GitHub::Ldap::UserSearch::GlobalCatalog")
2121
stub_entry = mock("Net::LDAP::Entry")
2222

23-
mock_global_catalog_connection.expects(:search).returns(stub_entry)
23+
mock_global_catalog_connection.expects(:search).returns([stub_entry])
2424
ad_user_search.expects(:global_catalog_connection).returns(mock_global_catalog_connection)
2525

2626
results = ad_user_search.perform("login", "CN=Joe", "uid", {})

0 commit comments

Comments
 (0)