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

Conflicts:
	app/observers/user_observer.rb
	spec/observers/user_observer_spec.rb

1 files changed, 6 insertions, 0 deletions

diff --git a/spec/observers/user_observer_spec.rb b/spec/observers/user_observer_spec.rb
index bffa5fcfd69..dd7d88fafc9 100644
--- a/spec/observers/user_observer_spec.rb
+++ b/spec/observers/user_observer_spec.rb
@@ -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