deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Update new_user_email to take id for User and perform find itself.

Browse source
This commit is contained in:
Robb Kidd 2012-05-14 23:07:36 -04:00
parent 06b45acb8f
commit 345f176a74
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/mailers/notify.rb
View file

@ -7,10 +7,10 @@ class Notify < ActionMailer::Base
default from: EMAIL_OPTS["from"] default from: EMAIL_OPTS["from"]
def new_user_email(user, password) def new_user_email(user_id, password)
@user = user @user = User.find(user_id)
@password = password @password = password
mail(:to => @user['email'], :subject => "gitlab | Account was created for you") mail(:to => @user.email, :subject => "gitlab | Account was created for you")
end end
def new_issue_email(issue) def new_issue_email(issue)

2
app/models/mailer_observer.rb
View file

@ -23,7 +23,7 @@ class MailerObserver < ActiveRecord::Observer
end end
def new_user(user) def new_user(user)
Notify.new_user_email(user, user.password).deliver Notify.new_user_email(user.id, user.password).deliver
end end
def new_note(note) def new_note(note)

4
spec/mailers/notify_spec.rb
View file

@ -19,9 +19,9 @@ describe Notify do
describe 'for new users, the email' do describe 'for new users, the email' do
let(:example_site_url) { root_url } let(:example_site_url) { root_url }
let(:new_user) { Factory.new(:user, :email => 'newguy@example.com', :password => 'new_password') } let(:new_user) { Factory.create(:user, :email => 'newguy@example.com') }
subject { Notify.new_user_email(new_user, new_user.password) } subject { Notify.new_user_email(new_user.id, new_user.password) }
it 'is sent to the new user' do it 'is sent to the new user' do
should deliver_to new_user.email should deliver_to new_user.email