Fixes password sending when creating user.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4500 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
0a2ec6ef04
commit
a49c7f95e2
|
@ -105,7 +105,7 @@ class UsersController < ApplicationController
|
||||||
@user.pref.save
|
@user.pref.save
|
||||||
@user.notified_project_ids = (@user.mail_notification == 'selected' ? params[:notified_project_ids] : [])
|
@user.notified_project_ids = (@user.mail_notification == 'selected' ? params[:notified_project_ids] : [])
|
||||||
|
|
||||||
Mailer.deliver_account_information(@user, params[:password]) if params[:send_information]
|
Mailer.deliver_account_information(@user, params[:user][:password]) if params[:send_information]
|
||||||
|
|
||||||
respond_to do |format|
|
respond_to do |format|
|
||||||
format.html {
|
format.html {
|
||||||
|
|
|
@ -168,7 +168,41 @@ class UsersControllerTest < ActionController::TestCase
|
||||||
should_respond_with :success
|
should_respond_with :success
|
||||||
should_render_template :new
|
should_render_template :new
|
||||||
end
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def test_create
|
||||||
|
Setting.bcc_recipients = '1'
|
||||||
|
|
||||||
|
assert_difference 'User.count' do
|
||||||
|
assert_difference 'ActionMailer::Base.deliveries.size' do
|
||||||
|
post :create,
|
||||||
|
:user => {
|
||||||
|
:firstname => 'John',
|
||||||
|
:lastname => 'Doe',
|
||||||
|
:login => 'jdoe',
|
||||||
|
:password => 'secret',
|
||||||
|
:password_confirmation => 'secret',
|
||||||
|
:mail => 'jdoe@gmail.com',
|
||||||
|
:mail_notification => 'none'
|
||||||
|
},
|
||||||
|
:send_information => '1'
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
user = User.first(:order => 'id DESC')
|
||||||
|
assert_redirected_to :controller => 'users', :action => 'edit', :id => user.id
|
||||||
|
|
||||||
|
assert_equal 'John', user.firstname
|
||||||
|
assert_equal 'Doe', user.lastname
|
||||||
|
assert_equal 'jdoe', user.login
|
||||||
|
assert_equal 'jdoe@gmail.com', user.mail
|
||||||
|
assert_equal 'none', user.mail_notification
|
||||||
|
assert user.check_password?('secret')
|
||||||
|
|
||||||
|
mail = ActionMailer::Base.deliveries.last
|
||||||
|
assert_not_nil mail
|
||||||
|
assert_equal [user.mail], mail.bcc
|
||||||
|
assert mail.body.include?('secret')
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_update
|
def test_update
|
||||||
|
|
Loading…
Reference in New Issue