Harmonize blank option

README.md

@@ -200,6 +200,7 @@ This API accepts valid Date objects or a Date in milliseconds since Jan 1 1970,
 
 ```js
 {
+  propertyName: validateDate({ allowBlank: true }) // can be blank
   propertyName: validateDate({ before: new Date('3000-01-01') }), // must be before 1st Jan. 3000
   propertyName: validateDate({ onOrBefore: Date.parse(new Date('3000-01-01')) }), // must be not after 1st Jan. 3000
   propertyName: validateDate({ after: new Date('3000-01-01') }), // must be after 1st Jan. 3000

addon/validators/date.js

@@ -1,3 +1,5 @@
+import { isEmpty } from '@ember/utils';
+
 import buildMessage from 'ember-changeset-validations/utils/validation-errors';
 import withDefaults from 'ember-changeset-validations/utils/with-defaults';
 import toDate from 'ember-changeset-validations/utils/to-date';
@@ -19,7 +21,7 @@ export default function validateDate(options = {}) {
     let { before, onOrBefore, after, onOrAfter, message } = options;
     let type = 'date';
 
-    if (allowBlank && (typeof value === 'undefined' || value === null)) {
+    if (allowBlank && isEmpty(value)) {
       return true;
     }
 

addon/validators/number.js

@@ -5,10 +5,6 @@ import evValidateNumber from 'ember-validators/number';
 export default function validateNumber(options = {}) {
   options = withDefaults(options, { allowString: true, allowNone: false });
 
-  if (options.allowBlank) {
-    options.allowNone = true;
-  }
-
   return (key, value) => {
     let result = evValidateNumber(value, options, null, key);
     return result === true ? true : buildMessage(key, result);

tests/unit/validators/confirmation-test.js

@@ -70,7 +70,9 @@ module('Unit | Validator | confirmation', function () {
     let options = { allowBlank: true, on: 'foo' };
     let validator = validateConfirmation(options);
 
-    assert.true(validator(key, ''), 'Empty string is accepted');
+    assert.true(validator(key, null), 'null is accepted');
+    assert.true(validator(key, undefined), 'undefined is accepted');
+    assert.true(validator(key, ''), 'empty string is accepted');
   });
 });
 

tests/unit/validators/date-test.js

@@ -10,7 +10,8 @@ module('Unit | Validator | date', function () {
 
     assert.true(validator(key, null), 'null is allowed');
     assert.true(validator(key, undefined), 'undefined is allowed');
-    assert.true(validator(key, 123), 'number value is is allowed');
+    assert.true(validator(key, ''), 'empty string is allowed');
+    assert.true(validator(key, 123), 'number value is allowed');
 
     assert.equal(
       validator(key, '1992-03-30'),

tests/unit/validators/exclusion-test.js

@@ -76,6 +76,8 @@ module('Unit | Validator | exclusion', function () {
     let options = { allowBlank: true };
     let validator = validateExclusion(options);
 
-    assert.true(validator(key, ''), 'Empty string is accepted');
+    assert.true(validator(key, null), 'null is accepted');
+    assert.true(validator(key, undefined), 'undefined is accepted');
+    assert.true(validator(key, ''), 'empty string is accepted');
   });
 });

tests/unit/validators/format-test.js

@@ -16,7 +16,9 @@ module('Unit | Validator | format', function () {
     let options = { allowBlank: true };
     let validator = validateFormat(options);
 
-    assert.true(validator(key, ''));
+    assert.true(validator(key, null), 'null is accepted');
+    assert.true(validator(key, undefined), 'undefined is accepted');
+    assert.true(validator(key, ''), 'empty string is accepted');
   });
 
   test('it accepts a `type` option', function (assert) {

tests/unit/validators/inclusion-test.js

@@ -82,6 +82,8 @@ module('Unit | Validator | inclusion', function () {
     let options = { allowBlank: true };
     let validator = validateInclusion(options);
 
-    assert.true(validator(key, ''), 'Empty string is accepted');
+    assert.true(validator(key, null), 'null is accepted');
+    assert.true(validator(key, undefined), 'undefined is accepted');
+    assert.true(validator(key, ''), 'empty string is accepted');
   });
 });