Use same server time in WriteResult as in docs

Author: op

src/firestore-document.js

@@ -111,9 +111,9 @@ MockFirestoreDocument.prototype.create = function (data, callback) {
       var base = self._getData();
       err = err || self._validateDoesNotExist(base);
       if (err === null) {
-        var timestamp = Timestamp.fromMillis(utils.getServerTime());
-        var result = new WriteResult(timestamp);
-        data = utils.removeEmptyFirestoreProperties(data);
+        var serverTime = utils.getServerTime();
+        var result = new WriteResult(Timestamp.fromMillis(serverTime));
+        data = utils.removeEmptyFirestoreProperties(data, serverTime);
         self._dataChanged(data);
         resolve(result);
       } else {
@@ -137,7 +137,7 @@ MockFirestoreDocument.prototype.set = function (data, opts, callback) {
   return new Promise(function (resolve, reject) {
     self._defer('set', _.toArray(arguments), function () {
       if (err === null) {
-        data = utils.removeEmptyFirestoreProperties(data);
+        data = utils.removeEmptyFirestoreProperties(data, utils.getServerTime());
         self._dataChanged(data);
         resolve();
       } else {
@@ -172,7 +172,7 @@ MockFirestoreDocument.prototype._update = function (changes, opts, callback) {
             data = _.assign(_.isObject(base) ? base : {}, utils.updateToFirestoreObject(changes));
           }
         }
-        data = utils.removeEmptyFirestoreProperties(data);
+        data = utils.removeEmptyFirestoreProperties(data, utils.getServerTime());
         self._dataChanged(data);
         resolve(data);
       } else {

src/utils.js

@@ -127,19 +127,19 @@ exports.removeEmptyRtdbProperties = function removeEmptyRtdbProperties(obj) {
   }
 };
 
-exports.removeEmptyFirestoreProperties = function removeEmptyFirestoreProperties(obj) {
+exports.removeEmptyFirestoreProperties = function removeEmptyFirestoreProperties(obj, serverTime) {
   if (!_.isPlainObject(obj)) {
     return obj;
   }
 
   var keys = getKeys(obj);
   if (keys.length > 0) {
     for (var s in obj) {
-      var value = removeEmptyFirestoreProperties(obj[s]);
+      var value = removeEmptyFirestoreProperties(obj[s], serverTime);
       if (FieldValue.delete().isEqual(value)) {
         delete obj[s];
       } else if (FieldValue.serverTimestamp().isEqual(value)) {
-        obj[s] = new Date(exports.getServerTime());
+        obj[s] = new Date(serverTime);
       } else if (value instanceof Timestamp) {
         obj[s] = value.toDate();
       }

test/unit/utils.js

@@ -56,56 +56,56 @@ describe('utils', function () {
 
 
   describe('removeEmptyFirestoreProperties', function () {
-
+    var serverTime = Date.now();
     it('should return null, when the obj is empty', function () {
-      expect(removeEmptyFirestoreProperties({})).to.eql({});
+      expect(removeEmptyFirestoreProperties({}), serverTime).to.eql({});
     });
 
     it('should make no changes, when obj does not contain an empty property', function () {
-      expect(removeEmptyFirestoreProperties({a: 1})).to.eql({a: 1});
+      expect(removeEmptyFirestoreProperties({a: 1}, serverTime)).to.eql({a: 1});
     });
 
     it('should make no changes, when obj is a bool', function () {
-      expect(removeEmptyFirestoreProperties(true)).to.eql(true);
+      expect(removeEmptyFirestoreProperties(true, serverTime)).to.eql(true);
     });
 
     it('should make no changes, when obj is a string', function () {
-      expect(removeEmptyFirestoreProperties('hi')).to.eql('hi');
+      expect(removeEmptyFirestoreProperties('hi', serverTime)).to.eql('hi');
     });
 
     it('should make no changes, when obj is a number', function () {
-      expect(removeEmptyFirestoreProperties(123)).to.eql(123);
+      expect(removeEmptyFirestoreProperties(123, serverTime)).to.eql(123);
     });
 
     it('should make no changes, when obj is a Date', function () {
       var date = new Date();
-      expect(removeEmptyFirestoreProperties(date)).to.eql(date);
+      expect(removeEmptyFirestoreProperties(date, serverTime)).to.eql(date);
     });
 
     it('should make no changes, when obj is a Timestamp', function () {
       var ts = new Timestamp(123, 123);
-      expect(removeEmptyFirestoreProperties(ts)).to.eql(ts);
+      expect(removeEmptyFirestoreProperties(ts, serverTime)).to.eql(ts);
     });
 
     it('should make no changes, when obj is a NaN', function () {
-      expect(removeEmptyFirestoreProperties(NaN)).to.eql(NaN);
+      expect(removeEmptyFirestoreProperties(NaN, serverTime)).to.eql(NaN);
     });
 
     it('should make no changes, when obj is a undefined', function () {
-      expect(removeEmptyFirestoreProperties(undefined)).to.eql(undefined);
+      expect(removeEmptyFirestoreProperties(undefined, serverTime)).to.eql(undefined);
     });
 
     it('should remove property, when it is null', function () {
-      expect(removeEmptyFirestoreProperties({a: 1, b: null})).to.eql({a: 1, b: null});
+      expect(removeEmptyFirestoreProperties({a: 1, b: null}, serverTime)).to.eql({a: 1, b: null});
     });
     it('should remove property, when it is an empty object', function () {
-      expect(removeEmptyFirestoreProperties({a: 1, b: {}})).to.eql({a: 1, b: {}});
+      expect(removeEmptyFirestoreProperties({a: 1, b: {}}, serverTime)).to.eql({a: 1, b: {}});
     });
     it('should remove property, when it is an empty array', function () {
-      expect(removeEmptyFirestoreProperties({a: 1, b: []})).to.eql({a: 1, b: []});
+      expect(removeEmptyFirestoreProperties({a: 1, b: []}, serverTime)).to.eql({a: 1, b: []});
     });
     it('should return null, when all properties are null ', function () {
-      expect(removeEmptyFirestoreProperties({a: {b: null}})).to.eql({a: {b: null}});
+      expect(removeEmptyFirestoreProperties({a: {b: null}}, serverTime)).to.eql({a: {b: null}});
     });
   });