##// END OF EJS Templates
jro_apps » redmine
RSS
Log the user in after registration if account activation is not needed....
Jean-Philippe Lang -
r1507:19cb6f96f4bf
parent child
Show More
Side by Side Unified
Context file:
r1507:19cb6f96f4bf Loading diff...:
Show file before | Show file after | Hide comments
@@ -134,8 +134,9 class AccountController < ApplicationController
134 # Automatic activation
134 # Automatic activation
135 @user.status = User::STATUS_ACTIVE
135 @user.status = User::STATUS_ACTIVE
136 if @user.save
136 if @user.save
137 self.logged_user = @user
137 flash[:notice] = l(:notice_account_activated)
138 flash[:notice] = l(:notice_account_activated)
138 redirect_to :action => 'login'
139 redirect_to :controller => 'my', :action => 'account'
139 end
140 end
140 else
141 else
141 # Manual activation by the administrator
142 # Manual activation by the administrator
Show file before | Show file after | Hide comments
@@ -67,8 +67,12 class AccountTest < ActionController::IntegrationTest
67
67
68 post 'account/register', :user => {:login => "newuser", :language => "en", :firstname => "New", :lastname => "User", :mail => "newuser@foo.bar"},
68 post 'account/register', :user => {:login => "newuser", :language => "en", :firstname => "New", :lastname => "User", :mail => "newuser@foo.bar"},
69 :password => "newpass", :password_confirmation => "newpass"
69 :password => "newpass", :password_confirmation => "newpass"
70 assert_redirected_to 'account/login'
70 assert_redirected_to 'my/account'
71 log_user('newuser', 'newpass')
71 follow_redirect!
72 assert_response :success
73 assert_template 'my/account'
74
75 assert User.find_by_login('newuser').active?
72 end
76 end
73
77
74 def test_register_with_manual_activation
78 def test_register_with_manual_activation
General Comments 0
You need to be logged in to leave comments. Login now