Merge remote-tracking branch 'origin/stable' into pkgr

pkgr · Feb 27, 2017 · c65411e · c65411e
2 parents bd4d20e + 2c9a43e
commit c65411e
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 42 deletions.
diff --git a/app/services/user_authenticator.rb b/app/services/user_authenticator.rb
@@ -21,10 +21,7 @@ def has_authenticator?
   end
 
   def finish
-    if authenticator && authenticated?
-      authenticator.after_create_account(@user, @session)
-    end
-
+    authenticator.after_create_account(@user, @session) if authenticator
     @session = nil
   end
 

diff --git a/spec/components/auth/user_authenticator_spec.rb b/spec/components/auth/user_authenticator_spec.rb
diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb
@@ -614,8 +614,6 @@ def post_user
           auth = session[:authentication] = {}
           auth[:authenticator_name] = 'twitter'
           auth[:extra_data] = twitter_auth
-          auth[:email_valid] = true
-          auth[:email] = @user.email
 
           TwitterUserInfo.expects(:create)