fix(User): ensure _mergeMagicFields returns data

Author: leeyeh

src/object.js

@@ -1005,7 +1005,7 @@ module.exports = function(AV) {
           output[key] = AV._parseDate(output[key]);
         }
       });
-      if (!output.updatedAt) {
+      if (output.createdAt && !output.updatedAt) {
         output.updatedAt = output.createdAt;
       }
       return output;

src/user.js

@@ -46,7 +46,7 @@ module.exports = function(AV) {
         this._sessionToken = attrs.sessionToken;
         delete attrs.sessionToken;
       }
-      AV.User.__super__._mergeMagicFields.call(this, attrs);
+      return AV.User.__super__._mergeMagicFields.call(this, attrs);
     },
 
     /**

test/object.js

@@ -107,6 +107,19 @@ describe('Objects', function(){
       parsedGameScore.get('score').should.eql(gameScore.get('score'));
     });
 
+    it('toJSON and parse (User)', () => {
+      const user = new AV.Object.createWithoutData('_User', 'objectId');
+      user.set('id', 'id');
+      user.set('score', 20);
+      const json = user.toJSON();
+      json.objectId.should.eql(user.id);
+      json.score.should.eql(user.get('score'));
+      const parsedUser = new AV.User(json, { parse: true });
+      parsedUser.id.should.eql(user.id);
+      parsedUser.get('id').should.eql(user.get('id'));
+      parsedUser.get('score').should.eql(user.get('score'));
+    });
+
     it('should create a User',function(){
       var User = AV.Object.extend("User");
       var u = new User();