Merge branch 'feature-refactor-oauth-instance-methods' into feature-multi-ldap-servers

lib/gitlab/oauth/user.rb

@@ -31,7 +31,7 @@ module Gitlab
 
         gl_user
       rescue ActiveRecord::RecordInvalid => e
-        log.info "(OAuth) Email #{e.record.errors[:email]}. Username #{e.record.errors[:username]}"
+        log.info "(OAuth) Error saving user: #{gl_user.errors.full_messages}"
         return self, e.record.errors
       end
 

spec/lib/gitlab/oauth/auth_hash_spec.rb

@@ -33,7 +33,7 @@ describe Gitlab::OAuth::AuthHash do
   context "email not provided" do
     before { info_hash.delete(:email) }
     it "generates a temp email" do
-      expect( auth_hash.email).to_not be_empty
+      expect( auth_hash.email).to start_with('temp-email-for-oauth')
     end
   end