From 19cb6f96f4bf3f10780e292d7b5b59d880b673e8 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Mon, 9 Jun 2008 18:59:15 +0000 Subject: [PATCH] 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 --- app/controllers/account_controller.rb | 3 ++- test/integration/account_test.rb | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb index b9224c158..3fbbc8912 100644 --- a/app/controllers/account_controller.rb +++ b/app/controllers/account_controller.rb @@ -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 diff --git a/test/integration/account_test.rb b/test/integration/account_test.rb index e9d665d19..a01a3ba09 100644 --- a/test/integration/account_test.rb +++ b/test/integration/account_test.rb @@ -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