kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Login link unexpected logs you out (#12611). 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11122 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2013-01-05 13:53:18 +00:00
parent d56f916a0e
commit 7c2490c6fc
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/account_controller.rb
View File

@ -25,7 +25,9 @@ class AccountController < ApplicationController
# Login request and validation # Login request and validation
def login def login
if request.get? if request.get?
logout_user if User.current.logged?
redirect_to home_url
end
else else
authenticate_user authenticate_user
end end

8
test/functional/account_controller_test.rb
View File

@ -33,6 +33,14 @@ class AccountControllerTest < ActionController::TestCase
assert_select 'input[name=password]' assert_select 'input[name=password]'
end end
def test_get_login_while_logged_in_should_redirect_to_home
@request.session[:user_id] = 2
get :login
assert_redirected_to '/'
assert_equal 2, @request.session[:user_id]
end
def test_login_should_redirect_to_back_url_param def test_login_should_redirect_to_back_url_param
# request.uri is "test.host" in test environment # request.uri is "test.host" in test environment
post :login, :username => 'jsmith', :password => 'jsmith', :back_url => 'http://test.host/issues/show/1' post :login, :username => 'jsmith', :password => 'jsmith', :back_url => 'http://test.host/issues/show/1'