Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-08 06:15:59 +01:00
Code Issues Packages Projects Releases Activity

revert r16322 (#24970)

Browse Source 
Some tests fail.

git-svn-id: http://svn.redmine.org/redmine/trunk@16323 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA
2017-02-02 03:01:19 +00:00
parent d37125dfe9
commit 5a86f95d29
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@@ -26,7 +26,7 @@ gem "rbpdf", "~> 1.19.0"
# Optional gem for LDAP authentication # Optional gem for LDAP authentication
group :ldap do group :ldap do
gem "net-ldap", "~> 0.12.1" gem "net-ldap", "~> 0.12.0"
end end
# Optional gem for OpenID authentication # Optional gem for OpenID authentication

4
app/models/auth_source_ldap.rb
View File

@@ -21,7 +21,7 @@ require 'timeout'
class AuthSourceLdap < AuthSource class AuthSourceLdap < AuthSource
NETWORK_EXCEPTIONS = [ NETWORK_EXCEPTIONS = [
Net::LDAP::Error, Net::LDAP::LdapError,
Errno::ECONNABORTED, Errno::ECONNREFUSED, Errno::ECONNRESET, Errno::ECONNABORTED, Errno::ECONNREFUSED, Errno::ECONNRESET,
Errno::EHOSTDOWN, Errno::EHOSTUNREACH, Errno::EHOSTDOWN, Errno::EHOSTUNREACH,
SocketError SocketError
@@ -117,7 +117,7 @@ class AuthSourceLdap < AuthSource
if filter.present? if filter.present?
Net::LDAP::Filter.construct(filter) Net::LDAP::Filter.construct(filter)
end end
rescue Net::LDAP::Error, Net::LDAP::FilterSyntaxInvalidError rescue Net::LDAP::LdapError, Net::LDAP::FilterSyntaxInvalidError
nil nil
end end

2
test/functional/auth_sources_controller_test.rb
View File

@@ -134,7 +134,7 @@ class AuthSourcesControllerTest < Redmine::ControllerTest
end end
def test_test_connection_with_failure def test_test_connection_with_failure
AuthSourceLdap.any_instance.stubs(:initialize_ldap_con).raises(Net::LDAP::Error.new("Something went wrong")) AuthSourceLdap.any_instance.stubs(:initialize_ldap_con).raises(Net::LDAP::LdapError.new("Something went wrong"))
get :test_connection, :id => 1 get :test_connection, :id => 1
assert_redirected_to '/auth_sources' assert_redirected_to '/auth_sources'

2
test/unit/auth_source_ldap_test.rb
View File

@@ -150,7 +150,7 @@ class AuthSourceLdapTest < ActiveSupport::TestCase
end end
def test_search_with_exception_should_return_an_empty_array def test_search_with_exception_should_return_an_empty_array
Net::LDAP.stubs(:new).raises(Net::LDAP::Error, 'Cannot connect') Net::LDAP.stubs(:new).raises(Net::LDAP::LdapError, 'Cannot connect')
results = AuthSource.search("exa") results = AuthSource.search("exa")
assert_equal [], results assert_equal [], results

2
test/unit/user_test.rb
View File

@@ -643,7 +643,7 @@ class UserTest < ActiveSupport::TestCase
if ldap_configured? if ldap_configured?
test "#try_to_login using LDAP with failed connection to the LDAP server" do test "#try_to_login using LDAP with failed connection to the LDAP server" do
auth_source = AuthSourceLdap.find(1) auth_source = AuthSourceLdap.find(1)
AuthSource.any_instance.stubs(:initialize_ldap_con).raises(Net::LDAP::Error, 'Cannot connect') AuthSource.any_instance.stubs(:initialize_ldap_con).raises(Net::LDAP::LdapError, 'Cannot connect')
assert_nil User.try_to_login('edavis', 'wrong') assert_nil User.try_to_login('edavis', 'wrong')
end end