Merge branch 'development'

lmajano · lmajano · commit 1e94be0a0f77 · 2020-08-20T17:53:52.000-05:00
diff --git a/tests/specs/FrameworkSuperTypeTest.cfc b/tests/specs/FrameworkSuperTypeTest.cfc
@@ -1,4 +1,4 @@
-component extends="coldbox.system.testing.BaseTestCase" appMapping="/cbTestHarness" {
+component extends="tests.resources.BaseIntegrationTest"{
 
 	/*********************************** LIFE CYCLE Methods ***********************************/
 
diff --git a/tests/specs/cache/providers/CFProviderTest.cfc b/tests/specs/cache/providers/CFProviderTest.cfc
@@ -1,4 +1,4 @@
-﻿component name = "cacheTest" extends = "coldbox.system.testing.BaseTestCase" output = "false" skip = "isAdobe"{
+﻿component extends = "tests.resources.BaseIntegrationTest" skip = "isAdobe"{
 	this.loadColdBox = false;
 
 	boolean function isAdobe(){
diff --git a/tests/specs/cache/providers/CacheBoxProviderTest.cfc b/tests/specs/cache/providers/CacheBoxProviderTest.cfc
@@ -1,4 +1,4 @@
-﻿component extends = "coldbox.system.testing.BaseTestCase"{
+﻿component extends = "tests.resources.BaseIntegrationTest"{
 	this.loadColdBox = false;
 
 	function setup(){
diff --git a/tests/specs/cache/providers/LuceeProviderTest.cfc b/tests/specs/cache/providers/LuceeProviderTest.cfc
@@ -1,4 +1,4 @@
-﻿component extends = "coldbox.system.testing.BaseTestCase" skip = "isLucee"{
+﻿component extends = "tests.resources.BaseIntegrationTest" skip = "isLucee"{
 	this.loadColdBox = false;
 
 	boolean function isLucee(){
diff --git a/tests/specs/core/conversion/XMLConverterTest.cfc b/tests/specs/core/conversion/XMLConverterTest.cfc
@@ -1,5 +1,5 @@
-﻿<cfcomponent extends="coldbox.system.testing.BaseTestCase">
-	<cfscript>
+﻿component extends="tests.resources.BaseIntegrationTest"{
+
 	this.loadColdBox = false;
 
 	function setup(){
@@ -124,5 +124,5 @@
 		// debug(results);
 		assertTrue( isXML( results ) );
 	}
-	</cfscript>
-</cfcomponent>
+
+}
diff --git a/tests/specs/integration/EventCaching.cfc b/tests/specs/integration/EventCaching.cfc
@@ -1,20 +1,4 @@
-﻿/*******************************************************************************
- *	Integration Test as BDD
- *
- *	Extends the integration class: coldbox.system.testing.BaseTestCase
- *
- *	so you can test your ColdBox application headlessly. The 'appMapping' points by default to
- *	the '/root' mapping created in the test folder Application.cfc.  Please note that this
- *	Application.cfc must mimic the real one in your root, including ORM settings if needed.
- *
- *	The 'execute()' method is used to execute a ColdBox event, with the following arguments
- *	* event : the name of the event
- *	* private : if the event is private or not
- *	* prePostExempt : if the event needs to be exempt of pre post interceptors
- *	* eventArguments : The struct of args to pass to the event
- *	* renderResults : Render back the results of the event
- *******************************************************************************/
-component
+﻿component
 	extends="tests.resources.BaseIntegrationTest"
 {
 
diff --git a/tests/specs/integration/EventExecutions.cfc b/tests/specs/integration/EventExecutions.cfc
@@ -1,19 +1,3 @@
-/*******************************************************************************
- *	Integration Test as BDD
- *
- *	Extends the integration class: coldbox.system.testing.BaseTestCase
- *
- *	so you can test your ColdBox application headlessly. The 'appMapping' points by default to
- *	the '/root' mapping created in the test folder Application.cfc.  Please note that this
- *	Application.cfc must mimic the real one in your root, including ORM settings if needed.
- *
- *	The 'execute()' method is used to execute a ColdBox event, with the following arguments
- *	* event : the name of the event
- *	* private : if the event is private or not
- *	* prePostExempt : if the event needs to be exempt of pre post interceptors
- *	* eventArguments : The struct of args to pass to the event
- *	* renderResults : Render back the results of the event
- *******************************************************************************/
 component extends="tests.resources.BaseIntegrationTest"{
 
 	/*********************************** LIFE CYCLE Methods ***********************************/
diff --git a/tests/specs/integration/ExecutorRegistrations.cfc b/tests/specs/integration/ExecutorRegistrations.cfc
@@ -1,19 +1,3 @@
-/*******************************************************************************
- *	Integration Test as BDD
- *
- *	Extends the integration class: coldbox.system.testing.BaseTestCase
- *
- *	so you can test your ColdBox application headlessly. The 'appMapping' points by default to
- *	the '/root' mapping created in the test folder Application.cfc.  Please note that this
- *	Application.cfc must mimic the real one in your root, including ORM settings if needed.
- *
- *	The 'execute()' method is used to execute a ColdBox event, with the following arguments
- *	* event : the name of the event
- *	* private : if the event is private or not
- *	* prePostExempt : if the event needs to be exempt of pre post interceptors
- *	* eventArguments : The struct of args to pass to the event
- *	* renderResults : Render back the results of the event
- *******************************************************************************/
 component
 	extends="tests.resources.BaseIntegrationTest"
 {
diff --git a/tests/specs/integration/MainTests.cfc b/tests/specs/integration/MainTests.cfc
@@ -1,20 +1,4 @@
-﻿/*******************************************************************************
- *	Integration Test as BDD
- *
- *	Extends the integration class: coldbox.system.testing.BaseTestCase
- *
- *	so you can test your ColdBox application headlessly. The 'appMapping' points by default to
- *	the '/root' mapping created in the test folder Application.cfc.  Please note that this
- *	Application.cfc must mimic the real one in your root, including ORM settings if needed.
- *
- *	The 'execute()' method is used to execute a ColdBox event, with the following arguments
- *	* event : the name of the event
- *	* private : if the event is private or not
- *	* prePostExempt : if the event needs to be exempt of pre post interceptors
- *	* eventArguments : The struct of args to pass to the event
- *	* renderResults : Render back the results of the event
- *******************************************************************************/
-component
+﻿component
 	extends="tests.resources.BaseIntegrationTest"
 {
 
diff --git a/tests/specs/integration/ModuleTests.cfc b/tests/specs/integration/ModuleTests.cfc
@@ -1,19 +1,3 @@
-/*******************************************************************************
- *	Integration Test as BDD
- *
- *	Extends the integration class: coldbox.system.testing.BaseTestCase
- *
- *	so you can test your ColdBox application headlessly. The 'appMapping' points by default to
- *	the '/root' mapping created in the test folder Application.cfc.  Please note that this
- *	Application.cfc must mimic the real one in your root, including ORM settings if needed.
- *
- *	The 'execute()' method is used to execute a ColdBox event, with the following arguments
- *	* event : the name of the event
- *	* private : if the event is private or not
- *	* prePostExempt : if the event needs to be exempt of pre post interceptors
- *	* eventArguments : The struct of args to pass to the event
- *	* renderResults : Render back the results of the event
- *******************************************************************************/
 component extends="tests.resources.BaseIntegrationTest" {
 
 	/*********************************** LIFE CYCLE Methods ***********************************/
diff --git a/tests/specs/integration/Renderings.cfc b/tests/specs/integration/Renderings.cfc
@@ -1,19 +1,3 @@
-/*******************************************************************************
- *	Integration Test as BDD
- *
- *	Extends the integration class: coldbox.system.testing.BaseTestCase
- *
- *	so you can test your ColdBox application headlessly. The 'appMapping' points by default to
- *	the '/root' mapping created in the test folder Application.cfc.  Please note that this
- *	Application.cfc must mimic the real one in your root, including ORM settings if needed.
- *
- *	The 'execute()' method is used to execute a ColdBox event, with the following arguments
- *	* event : the name of the event
- *	* private : if the event is private or not
- *	* prePostExempt : if the event needs to be exempt of pre post interceptors
- *	* eventArguments : The struct of args to pass to the event
- *	* renderResults : Render back the results of the event
- *******************************************************************************/
 component
 	extends="tests.resources.BaseIntegrationTest"
 {
diff --git a/tests/specs/integration/RestfulHandlersTests.cfc b/tests/specs/integration/RestfulHandlersTests.cfc
@@ -1,19 +1,3 @@
-/*******************************************************************************
- *	Integration Test as BDD
- *
- *	Extends the integration class: coldbox.system.testing.BaseTestCase
- *
- *	so you can test your ColdBox application headlessly. The 'appMapping' points by default to
- *	the '/root' mapping created in the test folder Application.cfc.  Please note that this
- *	Application.cfc must mimic the real one in your root, including ORM settings if needed.
- *
- *	The 'execute()' method is used to execute a ColdBox event, with the following arguments
- *	* event : the name of the event
- *	* private : if the event is private or not
- *	* prePostExempt : if the event needs to be exempt of pre post interceptors
- *	* eventArguments : The struct of args to pass to the event
- *	* renderResults : Render back the results of the event
- *******************************************************************************/
 component extends="tests.resources.BaseIntegrationTest" {
 
 	function beforeAll(){
diff --git a/tests/specs/integration/RestfulTests.cfc b/tests/specs/integration/RestfulTests.cfc
@@ -1,19 +1,3 @@
-/*******************************************************************************
- *	Integration Test as BDD
- *
- *	Extends the integration class: coldbox.system.testing.BaseTestCase
- *
- *	so you can test your ColdBox application headlessly. The 'appMapping' points by default to
- *	the '/root' mapping created in the test folder Application.cfc.  Please note that this
- *	Application.cfc must mimic the real one in your root, including ORM settings if needed.
- *
- *	The 'execute()' method is used to execute a ColdBox event, with the following arguments
- *	* event : the name of the event
- *	* private : if the event is private or not
- *	* prePostExempt : if the event needs to be exempt of pre post interceptors
- *	* eventArguments : The struct of args to pass to the event
- *	* renderResults : Render back the results of the event
- *******************************************************************************/
 component
 	extends="tests.resources.BaseIntegrationTest"
 {
diff --git a/tests/specs/ioc/BuilderTest.cfc b/tests/specs/ioc/BuilderTest.cfc
@@ -1,4 +1,4 @@
-﻿component extends = "coldbox.system.testing.BaseTestCase"{
+﻿component extends = "tests.resources.BaseIntegrationTest"{
 	this.loadColdBox = false;
 
 	function setup(){
diff --git a/tests/specs/ioc/InjectorCreationTest.cfc b/tests/specs/ioc/InjectorCreationTest.cfc
@@ -1,4 +1,4 @@
-﻿component extends = "coldbox.system.testing.BaseTestCase"{
+﻿component extends = "tests.resources.BaseIntegrationTest"{
 	this.loadColdBox = false;
 
 	function setup(){
@@ -141,7 +141,7 @@
 	function testWebService(){
 		ws = injector.getInstance( "coldboxWS" );
 
-		// 
+		//
 		if ( listFindNoCase( "Lucee", server.coldfusion.productname ) ) {
 			expect( getMetadata( ws ).name ).toMatch( "rpc" );
 		}
diff --git a/tests/specs/ioc/InjectorLiveTest.cfc b/tests/specs/ioc/InjectorLiveTest.cfc
@@ -1,7 +1,7 @@
 /**
  * My BDD Test
  */
-component extends="coldbox.system.testing.BaseTestCase" {
+component extends="tests.resources.BaseIntegrationTest" {
 
 	this.loadColdBox = false;
 
diff --git a/tests/specs/ioc/InjectorTest.cfc b/tests/specs/ioc/InjectorTest.cfc
@@ -1,5 +1,5 @@
-﻿<cfcomponent extends="coldbox.system.testing.BaseTestCase">
-	<cfscript>
+﻿component extends="tests.resources.BaseIntegrationTest"{
+
 	this.loadColdBox = false;
 
 	function setup(){
@@ -227,5 +227,5 @@
 		injector.autowire( target = createStub(), targetID = "myTargetID" );
 		assertTrue( util.$once( "getInheritedMetaData" ) );
 	}
-	</cfscript>
-</cfcomponent>
+
+}
diff --git a/tests/specs/ioc/ProviderTest.cfc b/tests/specs/ioc/ProviderTest.cfc
@@ -1,5 +1,5 @@
-﻿<cfcomponent extends="coldbox.system.testing.BaseTestCase">
-	<cfscript>
+﻿component extends="tests.resources.BaseIntegrationTest"{
+
 	this.loadColdBox = false;
 
 	function setup(){
@@ -66,5 +66,5 @@
 		r = provider.sayHello();
 		assertEquals( "luis", r );
 	}
-	</cfscript>
-</cfcomponent>
+
+}
diff --git a/tests/specs/ioc/aop/MixerTest.cfc b/tests/specs/ioc/aop/MixerTest.cfc
@@ -1,4 +1,4 @@
-component extends="coldbox.system.testing.BaseTestCase" {
+component extends="tests.resources.BaseIntegrationTest" {
 
 	this.loadColdBox = false;
 
diff --git a/tests/specs/ioc/config/BinderTest.cfc b/tests/specs/ioc/config/BinderTest.cfc
@@ -1,6 +1,7 @@
-﻿<cfcomponent extends="coldbox.system.testing.BaseTestCase">
-	<cfscript>
+﻿component extends="tests.resources.BaseIntegrationTest"{
+
 	this.loadColdBox = false;
+
 	function setup(){
 		super.setup();
 
@@ -121,9 +122,9 @@
 	}
 
 	function testParent(){
-		// 
+		//
 		// create "dependency" beans to be injected
-		// 
+		//
 
 		// alpha and bravo are in the abstract service
 		config.map( "someAlphaDAO" ).to( "models.parent.SomeAlphaDAO" );
@@ -748,5 +749,5 @@
 		config.unMap( "MyService" );
 		assertFalse( config.mappingExists( "MyService" ) );
 	}
-	</cfscript>
-</cfcomponent>
+
+}
diff --git a/tests/specs/ioc/config/MappingTest.cfc b/tests/specs/ioc/config/MappingTest.cfc
@@ -1,5 +1,5 @@
-﻿<cfcomponent extends="coldbox.system.testing.BaseTestCase">
-	<cfscript>
+﻿component extends="tests.resources.BaseIntegrationTest"{
+
 	this.loadColdBox = false;
 
 	function setup(){
@@ -164,5 +164,5 @@
 		assertEquals( "MyRandomOBJ", methods[ 1 ].mapping );
 		assertEquals( "createRandom", methods[ 1 ].method );
 	}
-	</cfscript>
-</cfcomponent>
+
+}
diff --git a/tests/specs/remote/coldboxproxytest.cfc b/tests/specs/remote/coldboxproxytest.cfc
@@ -1,4 +1,4 @@
-﻿component extends = "coldbox.system.testing.BaseTestCase" appMapping = "/cbTestHarness"{
+﻿component extends = "tests.resources.BaseIntegrationTest"{
 	function setup(){
 		super.setup();
 		proxy = createObject( "component", "cbtestharness.remote.MyProxy" );
diff --git a/tests/specs/web/RendererTest.cfc b/tests/specs/web/RendererTest.cfc
@@ -1,7 +1,7 @@
 ﻿/**
  * Renderer integration tests
  */
-component extends="coldbox.system.testing.BaseTestCase" appMapping="/cbtestharness" {
+component extends="tests.resources.BaseIntegrationTest"{
 
 	/*********************************** LIFE CYCLE Methods ***********************************/
 
diff --git a/tests/specs/web/context/requestContextDecoratorTest.cfc b/tests/specs/web/context/requestContextDecoratorTest.cfc
@@ -1,7 +1,7 @@
 ﻿/**
  * Request Context Decorator
  */
-component extends="coldbox.system.testing.BaseTestCase" {
+component extends="tests.resources.BaseIntegrationTest" {
 
 	/*********************************** LIFE CYCLE Methods ***********************************/
 
diff --git a/tests/specs/web/flash/AbstractFlashScopeTest.cfc b/tests/specs/web/flash/AbstractFlashScopeTest.cfc
@@ -1,4 +1,4 @@
-﻿component extends = "coldbox.system.testing.BaseTestCase"{
+﻿component extends = "tests.resources.BaseIntegrationTest"{
 	this.loadColdBox = false;
 
 	function setup(){
diff --git a/tests/specs/web/flash/ClientFlashTest.cfc b/tests/specs/web/flash/ClientFlashTest.cfc
@@ -1,6 +1,7 @@
-﻿<cfcomponent extends="coldbox.system.testing.BaseTestCase" output="false">
-	<cfscript>
+﻿component extends="tests.resources.BaseIntegrationTest"{
+
 	this.loadColdBox = false;
+
 	function setup(){
 		flash          = createMock( "coldbox.system.web.flash.ClientFlash" );
 		mockController = createMock( className = "coldbox.system.web.Controller" );
@@ -58,5 +59,5 @@
 		assertTrue( structKeyExists( flash.getFlash(), "date" ) );
 		assertTrue( structKeyExists( flash.getFlash(), "test" ) );
 	}
-	</cfscript>
-</cfcomponent>
+
+}
diff --git a/tests/specs/web/flash/MockFlashTest.cfc b/tests/specs/web/flash/MockFlashTest.cfc
@@ -1,5 +1,5 @@
-<cfcomponent extends="coldbox.system.testing.BaseTestCase" output="false">
-	<cfscript>
+component extends="tests.resources.BaseIntegrationTest"{
+
 	this.loadColdBox = false;
 
 	function setup(){
@@ -52,5 +52,5 @@
 		flash.saveFlash();
 		assertEquals( flash.getMockFlash(), testScope );
 	}
-	</cfscript>
-</cfcomponent>
+
+}
diff --git a/tests/specs/web/flash/SessionFlashTest.cfc b/tests/specs/web/flash/SessionFlashTest.cfc
diff --git a/tests/specs/web/routing/RedirectsTest.cfc b/tests/specs/web/routing/RedirectsTest.cfc
diff --git a/tests/specs/web/routing/RoutingServiceTest.cfc b/tests/specs/web/routing/RoutingServiceTest.cfc
diff --git a/tests/specs/web/routing/SubdomainRoutingTest.cfc b/tests/specs/web/routing/SubdomainRoutingTest.cfc
diff --git a/tests/specs/web/services/HandlerServiceTest.cfc b/tests/specs/web/services/HandlerServiceTest.cfc
diff --git a/tests/specs/web/services/loaderserviceTest.cfc b/tests/specs/web/services/loaderserviceTest.cfc
diff --git a/tests/specs/web/services/requestserviceTest.cfc b/tests/specs/web/services/requestserviceTest.cfc

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-component extends="coldbox.system.testing.BaseTestCase" appMapping="/cbTestHarness" {`
	`1`	`+component extends="tests.resources.BaseIntegrationTest"{`
`2`	`2`
`3`	`3`	`/********************************* LIFE CYCLE Methods *********************************/`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-component name = "cacheTest" extends = "coldbox.system.testing.BaseTestCase" output = "false" skip = "isAdobe"{`
	`1`	`+component extends = "tests.resources.BaseIntegrationTest" skip = "isAdobe"{`
`2`	`2`	`this.loadColdBox = false;`
`3`	`3`
`4`	`4`	`boolean function isAdobe(){`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-component extends = "coldbox.system.testing.BaseTestCase"{`
	`1`	`+component extends = "tests.resources.BaseIntegrationTest"{`
`2`	`2`	`this.loadColdBox = false;`
`3`	`3`
`4`	`4`	`function setup(){`