From 5a86f95d290a35274ca944c160e44d56b3a3430c Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Thu, 2 Feb 2017 03:01:19 +0000 Subject: revert r16322 (#24970) Some tests fail. git-svn-id: http://svn.redmine.org/redmine/trunk@16323 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- test/unit/auth_source_ldap_test.rb | 2 +- test/unit/user_test.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'test/unit') diff --git a/test/unit/auth_source_ldap_test.rb b/test/unit/auth_source_ldap_test.rb index 3ce7fa98e..eac13ff70 100644 --- 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 3b42a7dec..ebc7d6532 100644 --- 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 -- cgit v1.2.3