Don't email omniauth created users

Gabor Liptak
1 parent 560b1ac5
Showing 2 changed files with 13 additions and 4 deletions Show diff stats
app/observers/user_observer.rb
spec/observers/user_observer_spec.rb
 class UserObserver < ActiveRecord::Observer
   def after_create(user)
     log_info("User \"#{user.name}\" (#{user.email}) was created")
-
-    Notify.new_user_email(user.id, user.password).deliver
+    unless user.extern_uid?
+      Notify.new_user_email(user.id, user.password).deliver
+    end
   end
   def after_destroy user
@@ -13,17 +13,25 @@ describe UserObserver do
   end
   context 'when a new user is created' do
-    let(:user) { double(:user, id: 42, password: 'P@ssword!', name: 'John', email: 'u@mail.local') }
     let(:notification) { double :notification }
-    it 'sends an email' do
+    it 'sends an email unless external' do
+      user = double(:user, id: 42, password: 'P@ssword!', name: 'John', email: 'u@mail.local', extern_uid?: false)
       notification.should_receive(:deliver)
       Notify.should_receive(:new_user_email).with(user.id, user.password).and_return(notification)
       subject.after_create(user)
     end
+    it 'no email for external' do
+      user = double(:user, id: 42, password: 'P@ssword!', name: 'John', email: 'u@mail.local', extern_uid?: true)
+      Notify.should_not_receive(:new_user_email)
+
+      subject.after_create(user)
+    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)
       subject.after_create(user)
     end