Restore some of the Server Timestamp logic

Previous behavior for Server Timestamp was to return UNIX timestamp.
This is the correct bahviour still for the client firebase.database
library. This change restores this.

Author: op

src/firebase.js

@@ -7,7 +7,6 @@ var autoId = require('firebase-auto-ids');
 var Query = require('./query');
 var Snapshot = require('./snapshot');
 var Queue = require('./queue').Queue;
-var Timestamp = require('./timestamp');
 var utils = require('./utils');
 var Auth = require('./firebase-auth');
 var validate = require('./validators');
@@ -187,11 +186,11 @@ MockFirebase.prototype.update = function (changes, callback) {
     self._defer('update', _.toArray(arguments), function () {
       if (!err) {
         var base = self.getData();
-        var data = _.isPlainObject(base) ? base : {};
+        var data = _.isObject(base) ? base : {};
         // operate as a multi-set
         _.keys(changes).forEach(function (key) {
           var val = changes[key];
-          _.set(data, key.replace(/^\//, '').replace(/\//g, '.'), _.isPlainObject(val) ? utils.updateToRtdbObject(val) : val);
+          _.set(data, key.replace(/^\//, '').replace(/\//g, '.'), _.isObject(val) ? utils.updateToRtdbObject(val) : val);
         });
         data = utils.removeEmptyRtdbProperties(data);
         self._dataChanged(data);
@@ -445,16 +444,16 @@ MockFirebase.prototype._dataChanged = function (unparsedData) {
   var data = utils.cleanData(unparsedData);
 
   if (utils.isServerTimestamp(data)) {
-    data = Timestamp.fromMillis(utils.getServerTime());
+    data = utils.getServerTime();
   }
 
   if (pri !== this.priority) {
     this._priChanged(pri);
   }
   if (!_.isEqual(data, this.data)) {
     // _.keys() in Lodash 3 automatically coerces non-object to object
-    var oldKeys = _.isPlainObject(this.data) ? _.keys(this.data).sort() : [];
-    var newKeys = _.isPlainObject(data) ? _.keys(data).sort() : [];
+    var oldKeys = _.isObject(this.data) ? _.keys(this.data).sort() : [];
+    var newKeys = _.isObject(data) ? _.keys(data).sort() : [];
     var keysToRemove = _.difference(oldKeys, newKeys);
     var keysToChange = _.difference(newKeys, keysToRemove);
     var events = [];
@@ -463,22 +462,22 @@ MockFirebase.prototype._dataChanged = function (unparsedData) {
       self._removeChild(key, events);
     });
 
-    if (!_.isPlainObject(data)) {
+    if (!_.isObject(data)) {
       events.push(false);
       this.data = data;
     }
     else {
       keysToChange.forEach(function (key) {
         var childData = unparsedData[key];
         if (utils.isServerTimestamp(childData)) {
-          childData = Timestamp.fromMillis(utils.getServerTime());
+          childData = utils.getServerTime();
         }
         self._updateOrAdd(key, childData, events);
       });
     }
 
     // update order of my child keys
-    if (_.isPlainObject(this.data))
+    if (_.isObject(this.data))
       this._resort();
 
     // trigger parent notifications after all children have
@@ -489,7 +488,7 @@ MockFirebase.prototype._dataChanged = function (unparsedData) {
 
 MockFirebase.prototype._priChanged = function (newPriority) {
   if (utils.isServerTimestamp(newPriority)) {
-    newPriority = Timestamp.fromMillis(utils.getServerTime());
+    newPriority = utils.getServerTime();
   }
   this.priority = newPriority;
   if (this.parent) {
@@ -574,7 +573,7 @@ MockFirebase.prototype._triggerAll = function (events) {
 };
 
 MockFirebase.prototype._updateOrAdd = function (key, data, events) {
-  var exists = _.isPlainObject(this.data) && this.data.hasOwnProperty(key);
+  var exists = _.isObject(this.data) && this.data.hasOwnProperty(key);
   if (!exists) {
     return this._addChild(key, data, events);
   }
@@ -584,7 +583,7 @@ MockFirebase.prototype._updateOrAdd = function (key, data, events) {
 };
 
 MockFirebase.prototype._addChild = function (key, data, events) {
-  if (!_.isPlainObject(this.data)) {
+  if (!_.isObject(this.data)) {
     this.data = {};
   }
   this._addKey(key);
@@ -611,7 +610,7 @@ MockFirebase.prototype._removeChild = function (key, events) {
 
 MockFirebase.prototype._updateChild = function (key, data, events) {
   var cdata = utils.cleanData(data);
-  if (_.isPlainObject(this.data) && _.has(this.data, key) && !_.isEqual(this.data[key], cdata)) {
+  if (_.isObject(this.data) && _.has(this.data, key) && !_.isEqual(this.data[key], cdata)) {
     this.data[key] = cdata;
     var c = this.child(key);
     c._dataChanged(data);
@@ -630,7 +629,7 @@ MockFirebase.prototype._nextErr = function (type) {
 };
 
 MockFirebase.prototype._hasChild = function (key) {
-  return _.isPlainObject(this.data) && _.has(this.data, key);
+  return _.isObject(this.data) && _.has(this.data, key);
 };
 
 MockFirebase.prototype._childData = function (key) {

src/utils.js

@@ -96,7 +96,7 @@ exports.restoreServerClock = function restoreServerTime() {
 
 exports.isServerTimestamp = function isServerTimestamp(data) {
   return _.isObject(data) && data['.sv'] === 'timestamp';
-};
+}
 
 exports.removeEmptyRtdbProperties = function removeEmptyRtdbProperties(obj) {
   var t = typeof obj;

test/unit/firebase.js

@@ -75,7 +75,7 @@ describe('MockFirebase', function () {
     it('parses server timestamps', function () {
       ref.set(Firebase.ServerValue.TIMESTAMP);
       ref.flush();
-      expect(ref.getData()).to.have.property('seconds', 0);
+      expect(ref.getData()).to.equal(new Date().getTime());
     });
 
     it('parses server timestamps in child data', function () {
@@ -84,26 +84,26 @@ describe('MockFirebase', function () {
         foo: Firebase.ServerValue.TIMESTAMP
       });
       ref.flush();
-      expect(child.getData()).to.have.property('seconds', 0);
+      expect(child.getData()).to.equal(new Date().getTime());
     });
 
     it('parses server timestamps in priorities', function () {
       ref.setPriority(Firebase.ServerValue.TIMESTAMP);
       ref.flush();
-      expect(ref.priority).to.have.property('seconds', 0);
+      expect(ref).to.have.property('priority', new Date().getTime());
     });
 
     describe('Firebase#setClock', function () {
 
       afterEach(Firebase.restoreClock);
 
       it('sets a timestamp factory function', function () {
-        var customClock = sinon.stub().returns(10000);
+        var customClock = sinon.stub().returns(10);
         Firebase.setClock(customClock);
         ref.set(Firebase.ServerValue.TIMESTAMP);
         ref.flush();
         expect(customClock.callCount).to.equal(1);
-        expect(ref.getData()).to.have.property('seconds', 10);
+        expect(ref.getData()).to.equal(10);
       });
 
     });
@@ -116,7 +116,7 @@ describe('MockFirebase', function () {
         ref.set(Firebase.ServerValue.TIMESTAMP);
         ref.flush();
         expect(spy.called).to.equal(false);
-        expect(ref.getData()).to.have.property('seconds', 0);
+        expect(ref.getData()).to.equal(new Date().getTime());
       });
 
     });