kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'omniauth_no_email_1' of https://github.com/gliptak/gitlabhq into gliptak-omniauth_no_email_1

Browse source 
Conflicts:
	app/observers/user_observer.rb
	spec/observers/user_observer_spec.rb
This commit is contained in:
Dmitriy Zaporozhets 2013-03-05 16:48:18 +02:00
commit da6b53a80e
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/observers/user_observer.rb
View file

@ -2,7 +2,8 @@ class UserObserver < ActiveRecord::Observer
def after_create(user)
log_info("User \"#{user.name}\" (#{user.email}) was created")
Notify.delay.new_user_email(user.id, user.password)
# Dont email omniauth created users
Notify.delay.new_user_email(user.id, user.password) unless user.extern_uid?
end
def after_destroy user

6
spec/observers/user_observer_spec.rb
View file

@ -15,7 +15,13 @@ describe UserObserver do
create(:user)
end
it 'no email for external' do
Notify.should_receive(:new_user_email)
create(:user, extern_uid: '32442eEfsafada')
end
it 'trigger logger' do
user = double(:user, id: 42, password: 'P@ssword!', name: 'John', email: 'u@mail.local', extern_uid?: false)
Gitlab::AppLogger.should_receive(:info)
create(:user)
end