Merge pull request #260 from davincho/master

closes #259 Inject reverted object with option 'replace'

src/datastore/sync_methods/index.js

@@ -386,13 +386,13 @@ export default {
     let {_this, definition, _resourceName, _id, _options} = check.call(this, 'revert', resourceName, id, options)
 
     let preserve = _options.preserve || []
+    let injectObj = {}
 
     if (preserve.length === 0) {
-      return definition.inject(_this.previous(_resourceName, _id))
+      injectObj = _this.previous(_resourceName, _id)
     } else {
       let instance = definition.get(id)
       let previousInstance = _this.previous(_resourceName, _id)
-      let injectObj = {}
 
       if (!instance) { return }
 
@@ -403,8 +403,10 @@ export default {
           injectObj[key] = previousInstance[key]
         }
       })
-
-      return definition.inject(injectObj)
     }
+
+    return definition.inject(injectObj, {
+      onConflict: 'replace'
+    })
   }
 }

test/both/datastore/sync_methods/revert.test.js

@@ -29,4 +29,12 @@ describe('DS#revert', function () {
     assert.equal(post.age, 20, 'The age of the post should have been preserved');
     assert.equal(post.author, 'John', 'The author of the post should have been reverted');
   });
+  it('should revert key which has not been injected', function() {
+    Post.inject(p1);
+    var post = Post.get(p1.id);
+    assert.isUndefined(post.newProperty);
+    post.newProperty = 'new Property';
+    post.DSRevert();
+    assert.isUndefined(post.newProperty);
+  });
 });