dinislage/redmine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Makes AuthSource.authenticate return a hash instead of an array.

Browse Source 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3492 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2010-02-26 09:13:12 +00:00
parent f1d16bc007
commit d6f9e576e8
4 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/integration/account_test.rb
+2 -2
View File
@@ -149,7 +149,7 @@ class AccountTest < ActionController::IntegrationTest
def test_onthefly_registration
# disable registration
Setting.self_registration = '0'
AuthSource.expects(:authenticate).returns([:login => 'foo', :firstname => 'Foo', :lastname => 'Smith', :mail => 'foo@bar.com', :auth_source_id => 66])
AuthSource.expects(:authenticate).returns({:login => 'foo', :firstname => 'Foo', :lastname => 'Smith', :mail => 'foo@bar.com', :auth_source_id => 66})
post 'account/login', :username => 'foo', :password => 'bar'
assert_redirected_to 'my/page'
@@ -163,7 +163,7 @@ class AccountTest < ActionController::IntegrationTest
def test_onthefly_registration_with_invalid_attributes
# disable registration
Setting.self_registration = '0'
AuthSource.expects(:authenticate).returns([:login => 'foo', :lastname => 'Smith', :auth_source_id => 66])
AuthSource.expects(:authenticate).returns({:login => 'foo', :lastname => 'Smith', :auth_source_id => 66})
post 'account/login', :username => 'foo', :password => 'bar'
assert_response :success
test/unit/auth_source_ldap_test.rb
+2 -4
View File
@@ -43,10 +43,8 @@ class AuthSourceLdapTest < ActiveSupport::TestCase
context 'with a valid LDAP user' do
should 'return the user attributes' do
response = @auth.authenticate('example1','123456')
assert response.is_a?(Array), "An array was not returned"
assert response.first.present?, "No user data returned"
attributes = response.first
attributes = @auth.authenticate('example1','123456')
assert attributes.is_a?(Hash), "An hash was not returned"
assert_equal 'Example', attributes[:firstname]
assert_equal 'One', attributes[:lastname]
assert_equal 'example1@redmine.org', attributes[:mail]