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

b135162c · Tom Rochette · Holger Just · bde0f6a8 · b135162c · b135162c
Commit b135162c authored Jul 02, 2011 by Tom Rochette Committed by Holger Just Dec 18, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 3 deletions

account_controller.rb app/controllers/account_controller.rb +3 -3

account_controller_test.rb test/functional/account_controller_test.rb +11 -0

No files found.
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -20,9 +20,9 @@ class AccountController < ApplicationController

  # Login request and validation
  def login
-    if request.get?
-      logout_user
-    else
+    if User.current.logged?
+      redirect_to home_url
+    elsif request.post?
      authenticate_user
    end
  end

--- a/test/functional/account_controller_test.rb
+++ b/test/functional/account_controller_test.rb
@@ -47,6 +47,17 @@ class AccountControllerTest < ActionController::TestCase
               :content => /Invalid user or password/
  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)

  def test_login_with_openid_for_existing_user