fix(Object): _mergeMagicFields before set attributes when new Object with parse option (#397)

Author: leeyeh

src/object.js

@@ -50,6 +50,7 @@ module.exports = function(AV) {
     attributes = attributes || {};
     if (options && options.parse) {
       attributes = this.parse(attributes);
+      attributes = this._mergeMagicFields(attributes);
     }
     var defaults = AV._getValue(this, 'defaults');
     if (defaults) {
@@ -375,6 +376,7 @@ module.exports = function(AV) {
           delete attrs[attr];
         }
       });
+      return attrs;
     },
 
     /**
@@ -652,8 +654,6 @@ module.exports = function(AV) {
       // Run validation.
       this._validate(attrs, options);
 
-      this._mergeMagicFields(attrs);
-
       options.changes = {};
       var escaped = this._escapedAttributes;
       var prev = this._previousAttributes || {};

test/object.js

@@ -89,6 +89,17 @@ describe('Objects', function(){
       });
     });
 
+    it('toJSON and parse', () => {
+      const json = gameScore.toJSON();
+      json.objectId.should.eql(gameScore.id);
+      json.id.should.eql(gameScore.get('id'));
+      json.score.should.eql(gameScore.get('score'));
+      const parsedGameScore = new GameScore(json, { parse: true });
+      parsedGameScore.id.should.eql(gameScore.id);
+      parsedGameScore.get('id').should.eql(gameScore.get('id'));
+      parsedGameScore.get('score').should.eql(gameScore.get('score'));
+    });
+
     it('should create a User',function(){
       var User = AV.Object.extend("User");
       var u = new User();