- The way custom validators are retrieved so they are ColdBox 7+ compatible

Author: lmajano

box.json

@@ -46,7 +46,16 @@
         "format":"cfformat run helpers,interfaces,models,test-harness/tests/,ModuleConfig.cfc --overwrite",
         "format:watch":"cfformat watch helpers,interfaces,models,test-harness/tests/,ModuleConfig.cfc ./.cfformat.json",
         "format:check":"cfformat check helpers,interfaces,models,test-harness/tests/,ModuleConfig.cfc ./.cfformat.json",
-        "install:dependencies":"install && cd test-harness && install"
+        "install:dependencies":"install && cd test-harness && install",
+		"start:lucee" : "server start [email protected]",
+		"start:2018" : "server start [email protected]",
+		"start:2021" : "server start [email protected]",
+		"stop:lucee" : "server stop [email protected]",
+		"stop:2018" : "server stop [email protected]",
+		"stop:2021" : "server stop [email protected]",
+		"logs:lucee" : "server log [email protected] --follow",
+		"logs:2018" : "server log [email protected] --follow",
+		"logs:2021" : "server log [email protected] --follow"
     },
     "installPaths":{
         "cbi18n":"modules/cbi18n/"

changelog.md

@@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- The way custom validators are retrieved so they are ColdBox 7+ compatible
 - `pr` github action now just does format checks to avoid issues with other repos.
 - Consolidated Adobe 2021 scripts into the server scripts
 

models/ValidationManager.cfc

@@ -344,7 +344,6 @@ component accessors="true" serialize="false" singleton {
 			return wirebox.getInstance( coreValidators[ arguments.validatorType ] );
 		}
 
-		// Else switch checks
 		switch ( arguments.validatorType ) {
 			// Custom Validator
 			case "validator": {
@@ -353,15 +352,9 @@ component accessors="true" serialize="false" singleton {
 				}
 				return wirebox.getInstance( arguments.validationData );
 			}
-			// See if it's a WireBox Mapping
+			// Delegate to WireBox
 			default: {
-				if ( wirebox.getBinder().mappingExists( validatorType ) ) {
-					return wirebox.getInstance( validatorType );
-				}
-				throw(
-					message = "The validator you requested #arguments.validatorType# is not a valid validator",
-					type    = "ValidationManager.InvalidValidatorType"
-				);
+				return wirebox.getInstance( validatorType );
 			}
 		}
 	}

test-harness/box.json

@@ -5,15 +5,13 @@
     "private":true,
     "description":"",
     "dependencies":{
-        "coldbox":"^6.0.0",
         "cbi18n":"^3.0.0",
         "testbox":"*",
-        "cbdebugger":"^3.5.0+64"
+        "coldbox":"^6"
     },
     "installPaths":{
-        "coldbox":"coldbox/",
         "testbox":"testbox/",
         "cbi18n":"modules/cbi18n/",
-        "cbdebugger":"modules/cbdebugger/"
+        "coldbox":"coldbox/"
     }
 }

test-harness/layouts/Main.cfm

@@ -1,6 +1,6 @@
 <cfoutput>
 <h1>Module Tester</h1>
 <div>
-	#renderView()#
+	#view()#
 </div>
 </cfoutput>

test-harness/tests/specs/ValidationManagerTest.cfc

@@ -47,21 +47,19 @@ component extends="coldbox.system.testing.BaseTestCase" appMapping="/root" {
 				assertEquals( 0, results.getErrorCount() );
 			} );
 
-
 			it( "can process rules with custom validators from a wirebox mapping", function(){
 				var results       = getInstance( "cbvalidation.models.result.ValidationResult" );
-				var mockValidator = prepareMock( getInstance( "tests.resources.MockValidator" ) ).$(
+				var mockValidator = prepareMock( manager.getWirebox().getInstance( "tests.resources.MockValidator" ) ).$(
 					"validate",
 					true
 				);
 				var mockRule = { "tests.resources.MockValidator" : { customField : "hi" } };
 				var mock     = createStub().$( "getName", "luis" );
-
 				manager.processRules(
-					results = results,
-					rules   = mockRule,
-					target  = mock,
-					field   = "name"
+					results : results,
+					rules   : mockRule,
+					target  : mock,
+					field   : "name"
 				);
 				assertTrue(
 					mockValidator.$once( "validate" ),