revert r16322 (#24970)

Some tests fail.

git-svn-id: http://svn.redmine.org/redmine/trunk@16323 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/Gemfile b/Gemfile
index 57f6c072fe9852faf8c662ece6032a0bc96d0657..b539a769d8d5b441c1224b4ce1c36c70faba552c 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -26,7 +26,7 @@ gem "rbpdf", "~> 1.19.0"
 
 # Optional gem for LDAP authentication
 group :ldap do
-  gem "net-ldap", "~> 0.12.1"
+  gem "net-ldap", "~> 0.12.0"
 end
 
 # Optional gem for OpenID authentication

diff --git a/app/models/auth_source_ldap.rb b/app/models/auth_source_ldap.rb
index 1301e326cb93c3881d18d0122c3ed46e15c0e7e1..d2aa25212cc65d7f72a6cb7bf413b5b5f25c7d10 100644 (file)
--- a/app/models/auth_source_ldap.rb
+++ b/app/models/auth_source_ldap.rb
@@ -21,7 +21,7 @@ require 'timeout'
 
 class AuthSourceLdap < AuthSource
   NETWORK_EXCEPTIONS = [
-    Net::LDAP::Error,
+    Net::LDAP::LdapError,
     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::Error, Net::LDAP::FilterSyntaxInvalidError
+  rescue Net::LDAP::LdapError, Net::LDAP::FilterSyntaxInvalidError
     nil
   end
 

diff --git a/test/functional/auth_sources_controller_test.rb b/test/functional/auth_sources_controller_test.rb
index f711ce15953cdc0164568f93eb593b97e5eece27..1ad829655c89975e7f1e535f2680fcafc6f96e40 100644 (file)
--- a/test/functional/auth_sources_controller_test.rb
+++ b/test/functional/auth_sources_controller_test.rb
@@ -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::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
     assert_redirected_to '/auth_sources'

diff --git a/test/unit/auth_source_ldap_test.rb b/test/unit/auth_source_ldap_test.rb
index 3ce7fa98ef1b785b27835dc181c526e5ad90f7ce..eac13ff70edc6127825cdd318295436cfa3f9c90 100644 (file)
--- a/test/unit/auth_source_ldap_test.rb
+++ b/test/unit/auth_source_ldap_test.rb
@@ -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::Error, 'Cannot connect')
+      Net::LDAP.stubs(:new).raises(Net::LDAP::LdapError, 'Cannot connect')
 
       results = AuthSource.search("exa")
       assert_equal [], results

diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
index 3b42a7dec6255142480edee74a6e99f0fddd1b5f..ebc7d6532c3b49ee931b612735b780959ea02e14 100644 (file)
--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -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::Error, 'Cannot connect')
+      AuthSource.any_instance.stubs(:initialize_ldap_con).raises(Net::LDAP::LdapError, 'Cannot connect')
 
       assert_nil User.try_to_login('edavis', 'wrong')
     end