Add support for numeric timestamps on DateDiffGreaterThan

Author: Joao Madeiras

src/asserts/date-diff-greater-than-assert.js

@@ -3,9 +3,16 @@
  * Module dependencies.
  */
 
-import { Violation } from 'validator.js';
+import DateAssert from './date-assert';
+import { Assert as BaseAssert, Violation } from 'validator.js';
 import { assign } from 'lodash';
 
+/**
+ * Extend Assert with `DateAssert`.
+ */
+
+const Assert = BaseAssert.extend({ Date: DateAssert });
+
 /**
  * Export `DateDiffGreaterThanAssert`.
  */
@@ -53,12 +60,10 @@ export default function dateDiffGreaterThanAssert(threshold, options) {
    */
 
   this.validate = value => {
-    if (typeof value !== 'string' && Object.prototype.toString.call(value) !== '[object Date]') {
-      throw new Violation(this, value, { value: 'must_be_a_date_or_a_string' });
-    }
-
-    if (isNaN(Date.parse(value)) === true) {
-      throw new Violation(this, value, { absolute: this.absolute, asFloat: this.asFloat, fromDate: this.fromDate, threshold: this.threshold, unit: this.unit });
+    try {
+      new Assert().Date().validate(value);
+    } catch (e) {
+      throw new Violation(this, value, { value: 'must_be_a_date_or_a_string_or_a_number' });
     }
 
     let diff = moment(this.fromDate || Date.now()).diff(value, this.unit, this.asFloat);

test/asserts/date-diff-greater-than-assert_test.js

@@ -65,7 +65,7 @@ describe('DateDiffGreaterThanAssert', () => {
         should.fail();
       } catch (e) {
         e.should.be.instanceOf(Violation);
-        e.violation.value.should.equal('must_be_a_date_or_a_string');
+        e.violation.value.should.equal('must_be_a_date_or_a_string_or_a_number');
       }
     });
   });
@@ -81,6 +81,17 @@ describe('DateDiffGreaterThanAssert', () => {
     }
   });
 
+  it('should throw an error if the input value is an invalid timestamp', () => {
+    try {
+      new Assert().DateDiffGreaterThan(10).validate(-Number.MAX_VALUE);
+
+      should.fail();
+    } catch (e) {
+      e.should.be.instanceOf(Violation);
+      e.show().assert.should.equal('DateDiffGreaterThan');
+    }
+  });
+
   it('should throw an error if the diff between `now` and input date is equal to `threshold`', () => {
     const clock = sinon.useFakeTimers(0, 'Date');
 
@@ -243,6 +254,14 @@ describe('DateDiffGreaterThanAssert', () => {
     clock.restore();
   });
 
+  it('should accept a timestamp whose diff from `now` is greater than the threshold', () => {
+    const clock = sinon.useFakeTimers(0, 'Date');
+
+    new Assert().DateDiffGreaterThan(0).validate(-1);
+
+    clock.restore();
+  });
+
   it('should accept a date whose diff from `fromDate` is greater than the threshold', () => {
     new Assert().DateDiffGreaterThan(24, { asFloat: false, fromDate: new Date('1970-01-01 00:00:00'), unit: 'hours' }).validate(new Date('1969-12-30 00:00:00'));
   });