Download as
Browse Code »

Commit da6b53a80eea25371a976389f70ed5c78ce4c797

Authored by Dmitriy Zaporozhets
2 parents d5d9f1c5 cb2be3ce
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

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

…liptak-omniauth_no_email_1

Conflicts:
	app/observers/user_observer.rb
	spec/observers/user_observer_spec.rb
Showing 2 changed files with 8 additions and 1 deletions   Show diff stats
app/observers/user_observer.rb
  Diff comments   View file @da6b53a
... ... @@ -2,7 +2,8 @@ class UserObserver < ActiveRecord::Observer
2 2 def after_create(user)
3 3 log_info("User \"#{user.name}\" (#{user.email}) was created")
4 4  
5   - Notify.delay.new_user_email(user.id, user.password)
  5 + # Dont email omniauth created users
  6 + Notify.delay.new_user_email(user.id, user.password) unless user.extern_uid?
6 7 end
7 8  
8 9 def after_destroy user
... ...
spec/observers/user_observer_spec.rb
  Diff comments   View file @da6b53a
... ... @@ -15,7 +15,13 @@ describe UserObserver do
15 15 create(:user)
16 16 end
17 17  
  18 + it 'no email for external' do
  19 + Notify.should_receive(:new_user_email)
  20 + create(:user, extern_uid: '32442eEfsafada')
  21 + end
  22 +
18 23 it 'trigger logger' do
  24 + user = double(:user, id: 42, password: 'P@ssword!', name: 'John', email: 'u@mail.local', extern_uid?: false)
19 25 Gitlab::AppLogger.should_receive(:info)
20 26 create(:user)
21 27 end
... ...