Handle keys with empty values as present, not missing

Baggz · Jun 10, 2014 · 0a4fa0e · 0a4fa0e
1 parent 0a609a5
commit 0a4fa0e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 23 deletions.
diff --git a/releases/latest/amanda.js b/releases/latest/amanda.js
@@ -1034,9 +1034,9 @@ var requiredAttribute = function required(property, propertyValue, attributeValu
   if (attributeValue) {
 
     var undefinedCondition = isUndefined(propertyValue);
-    var emptyCondition = (isString(propertyValue) || isArray(propertyValue) || isObject(propertyValue)) && isEmpty(propertyValue);
+    var nullCondition = isNull(propertyValue);
 
-    if (undefinedCondition || emptyCondition) {
+    if (undefinedCondition || nullCondition) {
       this.addError();
     }
 
@@ -1049,6 +1049,7 @@ var requiredAttribute = function required(property, propertyValue, attributeValu
 // Export
 Validation.prototype.addAttribute('required', requiredAttribute);
 
+
 /**
  * Type
  */

diff --git a/src/engines/json/attributes/required.js b/src/engines/json/attributes/required.js
@@ -6,9 +6,9 @@ var requiredAttribute = function required(property, propertyValue, attributeValu
   if (attributeValue) {
 
     var undefinedCondition = isUndefined(propertyValue);
-    var emptyCondition = (isString(propertyValue) || isArray(propertyValue) || isObject(propertyValue)) && isEmpty(propertyValue);
+    var nullCondition = isNull(propertyValue);
 
-    if (undefinedCondition || emptyCondition) {
+    if (undefinedCondition || nullCondition) {
       this.addError();
     }
 
@@ -19,4 +19,4 @@ var requiredAttribute = function required(property, propertyValue, attributeValu
 };
 
 // Export
-Validation.prototype.addAttribute('required', requiredAttribute);
+Validation.prototype.addAttribute('required', requiredAttribute);
diff --git a/tests/json/attributes/required/required.js b/tests/json/attributes/required/required.js
@@ -49,12 +49,8 @@ suite('JSON/Attribute/required#string', function() {
       expect(error).to.be.ok();
     });
 
-    jsonSchemaValidator.validate('', schema, function(error) {
-      count += 1;
-      expect(error).to.be.ok();
-    });
 
-    expect(count).to.be.eql(3);
+    expect(count).to.be.eql(2);
 
   });
 
@@ -106,12 +102,7 @@ suite('JSON/Attribute/required#array', function() {
       expect(error).to.be.ok();
     });
 
-    jsonSchemaValidator.validate([], schema, function(error) {
-      count += 1;
-      expect(error).to.be.ok();
-    });
-
-    expect(count).to.be.eql(3);
+    expect(count).to.be.eql(2);
 
   });
 
@@ -165,13 +156,8 @@ suite('JSON/Attribute/required#object', function() {
       expect(error).to.be.ok();
     });
 
-    jsonSchemaValidator.validate({}, schema, function(error) {
-      count += 1;
-      expect(error).to.be.ok();
-    });
-
-    expect(count).to.be.eql(3);
+    expect(count).to.be.eql(2);
 
   });
 
-});
+});