Merge branch 'development' of github.com:coldbox-modules/cbox-validation into development

Author: lmajano

models/validators/UDFValidator.cfc

@@ -31,21 +31,21 @@ component accessors="true" singleton {
 		any targetValue,
 		any validationData
 	){
-		// return true if no data to check, type needs a data element to be checked.
-		if ( isNull( arguments.targetValue ) || ( isSimpleValue( arguments.targetValue ) && !len( arguments.targetValue ) ) ) {
-			return true;
-		}
+        // Validate against the UDF/closure
+        var passed = arguments.validationData(
+            isNull( arguments.targetValue ) ? javacast( "null", "" ) : arguments.targetValue,
+            arguments.target
+        );
 
-		// Validate against the UDF/closure
-		if ( arguments.validationData( arguments.targetValue, arguments.target ) ) {
+		if ( passed ) {
 			return true;
 		}
 
 		var args = {
 			message        : "The '#arguments.field#' value does not validate",
 			field          : arguments.field,
 			validationType : getName(),
-			rejectedValue  : ( isSimpleValue( arguments.targetValue ) ? arguments.targetValue : "" ),
+			rejectedValue  : !isNull( arguments.targetValue ) && isSimpleValue( arguments.targetValue ) ? arguments.targetValue : "",
 			validationData : arguments.validationData
 		};
 

test-harness/Application.cfc

@@ -8,13 +8,13 @@ component{
 
 	// UPDATE THE NAME OF THE MODULE IN TESTING BELOW
 	request.MODULE_NAME = "cbvalidation";
-	
+
 	// Application properties
 	this.name              = hash( getCurrentTemplatePath() );
 	this.sessionManagement = true;
 	this.sessionTimeout    = createTimeSpan(0,0,15,0);
     this.setClientCookies  = true;
-    
+
     /**************************************
 	LUCEE Specific Settings
 	**************************************/
@@ -58,7 +58,6 @@ component{
 
 	// request start
 	public boolean function onRequestStart(String targetPage){
-
 		// Process ColdBox Request
 		application.cbBootstrap.onRequestStart( arguments.targetPage );
 
@@ -77,4 +76,4 @@ component{
 		return application.cbBootstrap.onMissingTemplate( argumentCollection=arguments );
 	}
 
-}
+}

test-harness/box.json

@@ -6,10 +6,8 @@
     "description":"",
     "dependencies":{
         "coldbox":"^5.0.0",
-        "cbi18n":"^1.4.0"
-    },
-    "devDependencies":{
-        "testbox":"^3.0.0"
+        "cbi18n":"^1.4.0",
+        "testbox":"^3.1.0+339"
     },
     "installPaths":{
         "coldbox":"coldbox/",
@@ -19,4 +17,4 @@
     "testbox":{
         "runner":"http://localhost:60299/tests/runner.cfm"
     }
-}
+}

test-harness/tests/specs/validators/UDFValidatorTest.cfc

@@ -32,7 +32,17 @@ component extends="coldbox.system.testing.BaseModelTest" model="cbvalidation.mod
 			55,
 			variables.validate2
 		);
-		assertEquals( true, r );
+        assertEquals( true, r );
+
+        // null
+		r = model.validate(
+			result,
+			this,
+			"test",
+			javacast( "null", "" ),
+			variables.validate3
+		);
+        assertEquals( false, r );
 	}
 
 	private function validate( value, target ){
@@ -41,6 +51,10 @@ component extends="coldbox.system.testing.BaseModelTest" model="cbvalidation.mod
 
 	private function validate2( value, target ){
 		return arguments.value gt 4;
-	}
+    }
+
+    private function validate3( value, target ){
+        return false;
+    }
 
 }