Merge branch 'master' of https://github.com/codecombat/codecombat

.travis.yml

@@ -25,7 +25,7 @@ before_script:
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
   - "node index.js --unittest &"
-  - "sleep 10" # to give node a chance to start
+  - "sleep 15" # to give node a chance to start
 
 script:
   - "./node_modules/karma/bin/karma start --browsers Firefox --single-run --reporters progress"

app/core/social-handlers/FacebookHandler.coffee

@@ -15,7 +15,7 @@ userPropsToSave =
 module.exports = FacebookHandler = class FacebookHandler extends CocoClass
   subscriptions:
     'auth:logged-in-with-facebook': 'onFacebookLoggedIn'
-  
+
   loggedIn: false
 
   onFacebookLoggedIn: (e) ->
@@ -27,19 +27,19 @@ module.exports = FacebookHandler = class FacebookHandler extends CocoClass
       unless me.get(userProp)
         @loggedIn = true
         break
-        
+
     if @waitingForLogin and @loggedIn
       @fetchMeForLogin()
-    
+
   loginThroughFacebook: ->
     if @loggedIn
       @fetchMeForLogin()
     else
       FB.login()
       @waitingForLogin = true
-      
+
   fetchMeForLogin: ->
-    FB.api('/me', @onReceiveMeInfo)
+    FB.api('/me', {fields: 'email,last_name,first_name,gender'}, @onReceiveMeInfo)
 
   onReceiveMeInfo: (r) =>
     unless r.email

test/app/core/social-handlers/FacebookHandler.spec.coffee

@@ -69,7 +69,7 @@ describe 'lib/FacebookHandler.coffee', ->
     expect(FB.api).toHaveBeenCalled()
     apiArgs = FB.api.calls.argsFor(0)
     expect(apiArgs[0]).toBe('/me')
-    apiArgs[1](mockMe) # sending the 'response'
+    apiArgs[2](mockMe) # sending the 'response'
     request = jasmine.Ajax.requests.mostRecent()
     expect(request).toBeDefined()
     params = JSON.parse request.params