Merge branch 'master' into feature/add-list-collections

# Conflicts: # CHANGELOG.md
dmurvihill · Mar 2, 2020 · 4a6a54d · 4a6a54d
2 parents 4dfa974 + d1c7634
commit 4a6a54d
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   behavior of `onAuthStateChanged()` (see below)
 - Support for Firebase Messaging (Admin API)
 - Support for [FieldValue.increment](https://firebase.google.com/docs/reference/js/firebase.firestore.FieldValue#increment)
+- Support for [firestore.Timestamp.now()](https://firebase.google.com/docs/reference/js/firebase.firestore.Timestamp#now)
 - Support for `listCollections` in [DocumentReferences](https://googleapis.dev/nodejs/firestore/latest/DocumentReference.html#listCollections)
 
 ### Changed

diff --git a/src/timestamp.js b/src/timestamp.js
@@ -15,6 +15,10 @@ Timestamp.fromMillis = function(ms) {
   return new Timestamp(sec, ns);
 };
 
+Timestamp.now = function() {
+  return Timestamp.fromDate(new Date());
+};
+
 Timestamp.prototype.toDate = function () {
   var millis = this.seconds * 1000 + this.nanoseconds / (1000 * 1000);
   return new Date(millis);

diff --git a/test/unit/timestamp.js b/test/unit/timestamp.js
@@ -5,6 +5,14 @@ var sinon    = require('sinon');
 var Timestamp = require('../../src/timestamp');
 
 describe('Timestamp', function () {
+  var clock;
+  beforeEach(function () {
+    clock = sinon.useFakeTimers();
+  });
+  afterEach(function () {
+    clock.restore();
+  });
+
   describe('fromDate', function () {
     it('should convert from date', function () {
       var date = new Date('2009-02-13T23:31:30.123456789Z');
@@ -20,6 +28,13 @@ describe('Timestamp', function () {
       expect(timestamp.nanoseconds).to.equal(123000000);
     });
   });
+  describe('now', function () {
+    it('should create a current Timestamp', function () {
+      var now = new Date();
+      var timestamp = Timestamp.now();
+      expect(timestamp.toDate().getTime()).to.equal(now.getTime());
+    });
+  });
   describe('#toDate', function () {
     it('should convert to date', function () {
       var ts = new Timestamp(1234567890, 123456789);