jro_apps/redmine Commit - r15941:5a86f95d290a

revert r16322 (#24970)...

Toshi MARUYAMA -

r15941:5a86f95d290a

parent child

Context file:

r15941:5a86f95d290a

Gemfile +1 -1

             # 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

app/models/auth_source_ldap.rb +2 -2

             class AuthSourceLdap < AuthSource
               NETWORK_EXCEPTIONS = [
-                Net::LDAP::Error,
+                Net::LDAP::LdapError,
                 Errno::ECONNABORTED, Errno::ECONNREFUSED, Errno::ECONNRESET,
                 Errno::EHOSTDOWN, Errno::EHOSTUNREACH,
                 SocketError
                 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

test/functional/auth_sources_controller_test.rb +1 -1

               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'

test/unit/auth_source_ldap_test.rb +1 -1

                 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

test/unit/user_test.rb +1 -1

               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

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages