Commit b135162c authored by Tom Rochette's avatar Tom Rochette Committed by Holger Just

Login should redirect to welcome/home page if already logged in.

parent bde0f6a8
...@@ -20,9 +20,9 @@ class AccountController < ApplicationController ...@@ -20,9 +20,9 @@ class AccountController < ApplicationController
# Login request and validation # Login request and validation
def login def login
if request.get? if User.current.logged?
logout_user redirect_to home_url
else elsif request.post?
authenticate_user authenticate_user
end end
end end
......
...@@ -47,6 +47,17 @@ class AccountControllerTest < ActionController::TestCase ...@@ -47,6 +47,17 @@ class AccountControllerTest < ActionController::TestCase
:content => /Invalid user or password/ :content => /Invalid user or password/
end end
def test_login
get :login
assert_template 'login'
end
def test_login_with_logged_account
@request.session[:user_id] = 2
get :login
assert_redirected_to home_url
end
if Object.const_defined?(:OpenID) if Object.const_defined?(:OpenID)
def test_login_with_openid_for_existing_user def test_login_with_openid_for_existing_user
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment