fixing tests for cb6 and 7

Author: lmajano

test-harness/tests/resources/Binder.cfc

@@ -0,0 +1,54 @@
+/**
+ * Copyright Since 2005 ColdBox Framework by Luis Majano and Ortus Solutions, Corp
+ * www.ortussolutions.com
+ * ---
+ * The default ColdBox WireBox Injector configuration object that is used when the
+ * WireBox injector is created
+ **/
+ component extends="coldbox.system.ioc.config.Binder" {
+
+	/**
+	 * Configure WireBox, that's it!
+	 */
+	function configure(){
+		// The WireBox configuration structure DSL
+		wireBox = {
+			// Default LogBox Configuration file
+			logBoxConfig : "coldbox.system.ioc.config.LogBox",
+			// CacheBox Integration OFF by default
+			cacheBox     : {
+				enabled : false
+				// configFile = "coldbox.system.ioc.config.CacheBox", An optional configuration file to use for loading CacheBox
+				// cacheFactory = ""  A reference to an already instantiated CacheBox CacheFactory
+				// classNamespace = "" A class path namespace to use to create CacheBox: Default=coldbox.system.cache or wirebox.system.cache
+			},
+			// Name of a CacheBox cache to store metadata in to speed up start time.
+			// Since metadata is already stored in memory, this is only useful for a disk, etc cache that persists across restarts.
+			metadataCache     : "",
+			// Scope registration, automatically register a wirebox injector instance on any CF scope
+			// By default it registers itself on application scope
+			scopeRegistration : {
+				enabled : false
+			},
+			// DSL Namespace registrations
+			customDSL : {
+				 // namespace = "mapping name"
+			},
+			// Custom Storage Scopes
+			customScopes : {
+				 // annotationName = "mapping name"
+			},
+			// Package scan locations
+			scanLocations  : [],
+			// Stop Recursions
+			stopRecursions : [],
+			// Parent Injector to assign to the configured injector, this must be an object reference
+			parentInjector : "",
+			// Register all event listeners here, they are created in the specified order
+			listeners      : [
+				 // { class="", name="", properties={} }
+			]
+		};
+	}
+
+}

test-harness/tests/specs/unit/SecurityTest.cfc

@@ -12,6 +12,9 @@ component extends="coldbox.system.testing.BaseInterceptorTest" interceptor="cbse
 			beforeEach( function( currentSpec ){
 				// setup properties
 				setup();
+
+				mockWireBox = new coldbox.system.ioc.Injector( "tests.resources.Binder" );
+
 				mockController
 					.$( "getAppHash", hash( "appHash" ) )
 					.$( "getAppRootPath", expandPath( "/root" ) )
@@ -26,7 +29,7 @@ component extends="coldbox.system.testing.BaseInterceptorTest" interceptor="cbse
 					.$args( "modules" )
 					.$results( [] );
 
-				mockSecurityService = getMockBox().prepareMock( new cbsecurity.models.CBSecurity() );
+				mockSecurityService = prepareMock( new cbsecurity.models.CBSecurity() );
 
 				security = interceptor;
 				settings = {
@@ -101,12 +104,13 @@ component extends="coldbox.system.testing.BaseInterceptorTest" interceptor="cbse
 					"/tests/resources/security.json.cfm"
 				);
 				settings.firewall.validator = "tests.resources.security";
+				mockValidator = mockWireBox.getInstance( settings.firewall.validator );
 				security.getRulesLoader().$( "loadRules", [] );
 
 				security
 					.$( "getInstance" )
 					.$args( settings.firewall.validator )
-					.$results( mockWireBox.getInstance( settings.firewall.validator ) );
+					.$results( mockValidator );
 
 				security.afterAspectsLoad();
 
@@ -137,10 +141,11 @@ component extends="coldbox.system.testing.BaseInterceptorTest" interceptor="cbse
 
 			it( "does not enable invalid event handler processing on Coldbox versions 6+", function(){
 				security.setProperties( settings );
+				mockValidator = mockWireBox.getInstance( settings.firewall.validator );
 				security
 					.$( "getInstance" )
 					.$args( settings.firewall.validator )
-					.$results( mockWireBox.getInstance( settings.firewall.validator ) );
+					.$results( mockValidator );
 				security.configure();
 				expect( security.$getProperty( "enableInvalidHandlerCheck" ) ).toBeFalse();
 			} );
@@ -151,21 +156,23 @@ component extends="coldbox.system.testing.BaseInterceptorTest" interceptor="cbse
 					{ "version" : "5.0.0" },
 					false
 				);
+				mockValidator = mockWireBox.getInstance( settings.firewall.validator );
 				security
 					.$( "getInstance" )
 					.$args( settings.firewall.validator )
-					.$results( mockWireBox.getInstance( settings.firewall.validator ) );
+					.$results( mockValidator );
 				security.configure();
 				expect( security.$getProperty( "enableInvalidHandlerCheck" ) ).toBeTrue();
 			} );
 
 			describe( "It can load many types of rules", function(){
 				beforeEach( function( currentSpec ){
 					settings.firewall.validator = "tests.resources.security";
+					mockValidator = mockWireBox.getInstance( settings.firewall.validator );
 					security
 						.$( "getInstance" )
 						.$args( settings.firewall.validator )
-						.$results( mockWireBox.getInstance( settings.firewall.validator ) );
+						.$results( mockValidator );
 				} );
 
 				it( "can load JSON Rules", function(){
@@ -205,6 +212,7 @@ component extends="coldbox.system.testing.BaseInterceptorTest" interceptor="cbse
 			describe( "module settings rule loading", function(){
 				beforeEach( function( currentSpec ){
 					settings.firewall.rules.inline = [];
+					mockValidator = mockWireBox.getInstance( settings.firewall.validator );
 					security
 						.$property( propertyName = "securityModules", mock = {} )
 						.$property(
@@ -216,7 +224,7 @@ component extends="coldbox.system.testing.BaseInterceptorTest" interceptor="cbse
 						)
 						.$( "getInstance" )
 						.$args( settings.firewall.validator )
-						.$results( mockWireBox.getInstance( settings.firewall.validator ) );
+						.$results( mockValidator );
 				} );
 
 				it( "can load JSON Rules based on module settings", function(){