eleith
/
schemajs
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #13 from orangemug/feature/date-fix 

Dates defaulting when not empty
This commit is contained in:
eleith 2015-05-06 22:04:02 -07:00
parent 43c5ace4dd a59d3cff01
commit ffef9bb157
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/rules.js
View File

@ -265,7 +265,7 @@ function isValueEmpty(value) {
if (_.isUndefined(value)) {
return true;
}
var canUseIsEmpty = _.isString(value) || _.isArray(value) || _.isObject(value) || false;
var canUseIsEmpty = _.isString(value) || _.isArray(value) || (_.isObject(value) && !_.isDate(value)) || false;
if (canUseIsEmpty) {
return _.isEmpty(value);
}

20
test/bugs/13-default-date.js Normal file
View File

@ -0,0 +1,20 @@
describe("bugs", function() {
/*jshint expr:true*/
var schemajs = (typeof window === 'undefined') ? require('../schema') : window.schema;
var expect = (typeof window === 'undefined') ? require('chai').expect : window.chai.expect;
// <https://github.com/eleith/schemajs/pull/13>
it("Dates defaulting when not empty (#13)", function() {
var date1 = new Date;
var date2 = new Date(1985, 12);
var schema = schemajs.create({
dateTime: {type:'date', 'default': date1}
});
var input1 = schema.validate({});
var input2 = schema.validate({dateTime: date2});
expect(input1.data.dateTime).to.equal(date1);
expect(input2.data.dateTime).to.equal(date2);
});
});