Fix assert dependency issue

uphold · May 25, 2015 · 8dec7a5 · 8dec7a5
1 parent c561787
commit 8dec7a5
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 10 deletions.
diff --git a/lib/asserts/date-diff-greater-than-assert.js b/lib/asserts/date-diff-greater-than-assert.js
@@ -4,10 +4,19 @@
  */
 
 var _ = require('lodash');
-var DateAssert = require('./date-assert');
+var Asserts = require('validator');
+var Validator = require('validator.js').Validator;
 var Violation = require('validator.js').Violation;
 var moment = require('moment');
 
+/**
+ * Add custom error code for `date` or `string`.
+ */
+
+/* jshint camelcase: false */
+Validator.errorCode.must_be_a_date_or_a_string = 'must_be_a_date_or_a_string';
+/* jshint camelcase: true */
+
 /**
  * Export `DateDiffGreaterThanAssert`.
  */
@@ -50,9 +59,13 @@ module.exports = function(threshold, options) {
    */
 
   this.validate = function(value) {
-    try {
-      new DateAssert().validate(value);
-    } catch (e) {
+    if ('string' !== typeof value && !(value instanceof Date)) {
+      /* jshint camelcase: false */
+      throw new Violation(this, value, { value: Validator.errorCode.must_be_a_date_or_a_string });
+      /* jshint camelcase: true */
+    }
+
+    if (true !== Asserts.isDate(value)) {
       throw new Violation(this, value, { absolute: this.absolute, asFloat: this.asFloat, fromDate: this.fromDate, threshold: this.threshold, unit: this.unit });
     }
 

diff --git a/lib/asserts/date-diff-less-than-assert.js b/lib/asserts/date-diff-less-than-assert.js
@@ -4,10 +4,19 @@
  */
 
 var _ = require('lodash');
-var DateAssert = require('./date-assert');
+var Asserts = require('validator');
+var Validator = require('validator.js').Validator;
 var Violation = require('validator.js').Violation;
 var moment = require('moment');
 
+/**
+ * Add custom error code for `date` or `string`.
+ */
+
+/* jshint camelcase: false */
+Validator.errorCode.must_be_a_date_or_a_string = 'must_be_a_date_or_a_string';
+/* jshint camelcase: true */
+
 /**
  * Export `DateDiffLessThanAssert`.
  */
@@ -50,9 +59,13 @@ module.exports = function(threshold, options) {
    */
 
   this.validate = function(value) {
-    try {
-      new DateAssert().validate(value);
-    } catch (e) {
+    if ('string' !== typeof value && !(value instanceof Date)) {
+      /* jshint camelcase: false */
+      throw new Violation(this, value, { value: Validator.errorCode.must_be_a_date_or_a_string });
+      /* jshint camelcase: true */
+    }
+
+    if (true !== Asserts.isDate(value)) {
       throw new Violation(this, value, { absolute: this.absolute, asFloat: this.asFloat, fromDate: this.fromDate, threshold: this.threshold, unit: this.unit });
     }
 

diff --git a/test/asserts/date-diff-greater-than-assert_test.js b/test/asserts/date-diff-greater-than-assert_test.js
@@ -4,6 +4,7 @@
  */
 
 var Assert = require('validator.js').Assert;
+var Validator = require('validator.js').Validator;
 var Violation = require('validator.js').Violation;
 var assert = require('../../lib/asserts/date-diff-greater-than-assert');
 var sinon = require('sinon');
@@ -53,7 +54,7 @@ describe('DateDiffGreaterThanAssert', function() {
   });
 
   it('should throw an error if the input value is not a date', function() {
-    var choices = [[], {}, ''];
+    var choices = [[], {}];
 
     choices.forEach(function(choice) {
       try {
@@ -62,6 +63,9 @@ describe('DateDiffGreaterThanAssert', function() {
         should.fail();
       } catch (e) {
         e.should.be.instanceOf(Violation);
+        /* jshint camelcase: false */
+        e.violation.value.should.equal(Validator.errorCode.must_be_a_date_or_a_string);
+        /* jshint camelcase: true */
       }
     });
   });

diff --git a/test/asserts/date-diff-less-than-assert_test.js b/test/asserts/date-diff-less-than-assert_test.js
@@ -4,6 +4,7 @@
  */
 
 var Assert = require('validator.js').Assert;
+var Validator = require('validator.js').Validator;
 var Violation = require('validator.js').Violation;
 var assert = require('../../lib/asserts/date-diff-less-than-assert');
 var sinon = require('sinon');
@@ -53,7 +54,7 @@ describe('DateDiffLessThanAssert', function() {
   });
 
   it('should throw an error if the input value is not a date', function() {
-    var choices = [[], {}, ''];
+    var choices = [[], {}];
 
     choices.forEach(function(choice) {
       try {
@@ -62,6 +63,9 @@ describe('DateDiffLessThanAssert', function() {
         should.fail();
       } catch (e) {
         e.should.be.instanceOf(Violation);
+        /* jshint camelcase: false */
+        e.violation.value.should.equal(Validator.errorCode.must_be_a_date_or_a_string);
+        /* jshint camelcase: true */
       }
     });
   });