Skip to content

Commit a81ea69

Browse files
author
Branko Vukelic
committed
Added dateFixture to avoid duplication and fixed indentation.
1 parent 4c63c7b commit a81ea69

File tree

1 file changed

+16
-9
lines changed

1 file changed

+16
-9
lines changed

test/validator.test.js

+16-9
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,17 @@ var node_validator = require('../lib'),
22
Validator = new node_validator.Validator(),
33
assert = require('assert');
44

5+
function dateFixture() {
6+
var d = new Date();
7+
var Y = d.getFullYear();
8+
var M = d.getMonth() + 1; // 0-index
9+
var D = d.getDate();
10+
return {
11+
tomorrow: Y + '-' + M + '-' + (D + 1), // YYYY-MM-DD
12+
yesterday: Y + '-' + M + '-' + (D - 1) // YYYY-MM-DD
13+
};
14+
}
15+
516
module.exports = {
617
'test #isEmail()': function () {
718
//Try some invalid emails
@@ -518,22 +529,18 @@ module.exports = {
518529
},
519530

520531
'test #isAfter()': function() {
521-
var d = new Date();
522-
var Y = d.getFullYear();
523-
var M = d.getMonth() + 1; // 0-index
524-
var D = d.getDate();
525-
var tomorrow = Y + '-' + M + '-' + (D + 1); // YYYY-MM-DD
526-
var yesterday = Y + '-' + M + '-' + (D - 1); // YYYY-MM-DD
532+
var f = dateFixture();
527533

528534
assert.ok(Validator.check('2011-08-04').isAfter('2011-08-03'));
529535
assert.ok(Validator.check('08. 04. 2011.').isAfter(new Date('2011-08-04')));
530-
assert.ok(Validator.check(tomorrow).isAfter());
536+
assert.ok(Validator.check(f.tomorrow).isAfter());
531537

532538
assert.throws(function() {
533-
Validator.check('08/04/2011').isAfter('2011-09-01');
539+
Validator.check('08/04/2011').isAfter('2011-09-01');
534540
});
535541
assert.throws(function() {
536-
Validator.check(yesterday).isAfter();
542+
Validator.check(f.yesterday).isAfter();
543+
});
537544
});
538545
}
539546
}

0 commit comments

Comments
 (0)