Commit 227155e0 authored by marutosijp's avatar marutosijp

replace depricated Net::LDAP::LdapError by Net::LDAP::Error (#24970)

git-svn-id: https://svn.redmine.org/redmine/trunk@16322 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent 3ed11c72
......@@ -26,7 +26,7 @@ gem "rbpdf", "~> 1.19.0"
# Optional gem for LDAP authentication
group :ldap do
gem "net-ldap", "~> 0.12.0"
gem "net-ldap", "~> 0.12.1"
end
# Optional gem for OpenID authentication
......
......@@ -21,7 +21,7 @@ require 'timeout'
class AuthSourceLdap < AuthSource
NETWORK_EXCEPTIONS = [
Net::LDAP::LdapError,
Net::LDAP::Error,
Errno::ECONNABORTED, Errno::ECONNREFUSED, Errno::ECONNRESET,
Errno::EHOSTDOWN, Errno::EHOSTUNREACH,
SocketError
......@@ -117,7 +117,7 @@ class AuthSourceLdap < AuthSource
if filter.present?
Net::LDAP::Filter.construct(filter)
end
rescue Net::LDAP::LdapError, Net::LDAP::FilterSyntaxInvalidError
rescue Net::LDAP::Error, Net::LDAP::FilterSyntaxInvalidError
nil
end
......
......@@ -134,7 +134,7 @@ class AuthSourcesControllerTest < Redmine::ControllerTest
end
def test_test_connection_with_failure
AuthSourceLdap.any_instance.stubs(:initialize_ldap_con).raises(Net::LDAP::LdapError.new("Something went wrong"))
AuthSourceLdap.any_instance.stubs(:initialize_ldap_con).raises(Net::LDAP::Error.new("Something went wrong"))
get :test_connection, :id => 1
assert_redirected_to '/auth_sources'
......
......@@ -150,7 +150,7 @@ class AuthSourceLdapTest < ActiveSupport::TestCase
end
def test_search_with_exception_should_return_an_empty_array
Net::LDAP.stubs(:new).raises(Net::LDAP::LdapError, 'Cannot connect')
Net::LDAP.stubs(:new).raises(Net::LDAP::Error, 'Cannot connect')
results = AuthSource.search("exa")
assert_equal [], results
......
......@@ -643,7 +643,7 @@ class UserTest < ActiveSupport::TestCase
if ldap_configured?
test "#try_to_login using LDAP with failed connection to the LDAP server" do
auth_source = AuthSourceLdap.find(1)
AuthSource.any_instance.stubs(:initialize_ldap_con).raises(Net::LDAP::LdapError, 'Cannot connect')
AuthSource.any_instance.stubs(:initialize_ldap_con).raises(Net::LDAP::Error, 'Cannot connect')
assert_nil User.try_to_login('edavis', 'wrong')
end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment