Commit 19cb6f96 authored by Jean-Philippe Lang's avatar Jean-Philippe Lang

Log the user in after registration if account activation is not needed.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1521 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent 80a7486f
......@@ -134,8 +134,9 @@ class AccountController < ApplicationController
# Automatic activation
@user.status = User::STATUS_ACTIVE
if @user.save
self.logged_user = @user
flash[:notice] = l(:notice_account_activated)
redirect_to :action => 'login'
redirect_to :controller => 'my', :action => 'account'
end
else
# Manual activation by the administrator
......
......@@ -67,8 +67,12 @@ class AccountTest < ActionController::IntegrationTest
post 'account/register', :user => {:login => "newuser", :language => "en", :firstname => "New", :lastname => "User", :mail => "newuser@foo.bar"},
:password => "newpass", :password_confirmation => "newpass"
assert_redirected_to 'account/login'
log_user('newuser', 'newpass')
assert_redirected_to 'my/account'
follow_redirect!
assert_response :success
assert_template 'my/account'
assert User.find_by_login('newuser').active?
end
def test_register_with_manual_activation
......
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