Merge pull request #158 from Ortus-Solutions/development

v6.0.1
Ortus-Solutions · Dec 5, 2024 · 685be72 · 685be72
2 parents 336a1df + d3e47f0
commit 685be72
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 14 deletions.
diff --git a/Application.cfc b/Application.cfc
@@ -4,7 +4,7 @@
  */
 component {
 
-	this.name                   = "TestBox Development Suite " & hash( getCurrentTemplatePath() );
+	this.name                   = "TestBox Development Suite";
 	this.sessionManagement      = true;
 	// Local mappings
 	this.mappings[ "/testbox" ] = getDirectoryFromPath( getCurrentTemplatePath() );

diff --git a/box.json b/box.json
@@ -1,6 +1,6 @@
 {
     "name":"TestBox",
-    "version":"6.0.0",
+    "version":"6.0.1",
     "location":"https://downloads.ortussolutions.com/ortussolutions/testbox/@build.version@/[email protected]@.zip",
     "author":"Ortus Solutions <[email protected]>",
     "slug":"testbox",

diff --git a/system/BaseSpec.cfc b/system/BaseSpec.cfc
@@ -988,11 +988,11 @@ component {
 			var consolidatedLabels = arguments.spec.labels;
 			var md                 = getMetadata( this );
 			param md.labels        = "";
-			consolidatedLabels.addAll( listToArray( md.labels ) );
+			consolidatedLabels.append( listToArray( md.labels, true ) );
 			// Build labels from nested suites, so suites inherit from parent suite labels
 			var parentSuite = arguments.suite;
 			while ( !isSimpleValue( parentSuite ) ) {
-				consolidatedLabels.addAll( parentSuite.labels );
+				consolidatedLabels.append( parentSuite.labels, true );
 				parentSuite = parentSuite.parentref;
 			}
 

diff --git a/system/TestBox.cfc b/system/TestBox.cfc
@@ -406,16 +406,16 @@ component accessors="true" {
 
 		// Verify URL conventions for bundle, suites and specs exclusions.
 		if ( !isNull( url.testBundles ) ) {
-			testBundles.addAll( listToArray( urlDecode( url.testBundles ) ) );
+			testBundles.append( listToArray( urlDecode( url.testBundles ) ), true );
 		}
 		if ( !isNull( url.testSuites ) ) {
-			arguments.testSuites.addAll( listToArray( urlDecode( url.testSuites ) ) );
+			arguments.testSuites.append( listToArray( urlDecode( url.testSuites ) ), true );
 		}
 		if ( !isNull( url.testSpecs ) ) {
-			arguments.testSpecs.addAll( listToArray( urlDecode( url.testSpecs ) ) );
+			arguments.testSpecs.append( listToArray( urlDecode( url.testSpecs ) ), true );
 		}
 		if ( !isNull( url.testMethod ) ) {
-			arguments.testSpecs.addAll( listToArray( urlDecode( url.testMethod ) ) );
+			arguments.testSpecs.append( listToArray( urlDecode( url.testMethod ) ), true );
 		}
 
 		// Using a directory runner?

diff --git a/system/compat/framework/TestSuite.cfc b/system/compat/framework/TestSuite.cfc
@@ -19,13 +19,13 @@ component accessors="true" {
 
 	remote function addTest( required componentName, required method ){
 		arrayAppend( variables.bundles, arguments.componentName );
-		variables.testSpecs.addAll( listToArray( arguments.method ) );
+		variables.testSpecs.append( listToArray( arguments.method ), true );
 		return this;
 	}
 
 	remote function add( required componentName, required methods ){
 		arrayAppend( variables.bundles, arguments.componentName );
-		variables.testSpecs.addAll( listToArray( arguments.methods ) );
+		variables.testSpecs.append( listToArray( arguments.methods ), true );
 		return this;
 	}
 
@@ -36,7 +36,7 @@ component accessors="true" {
 
 	remote function run( testMethod = "" ){
 		if ( len( arguments.testMethod ) ) {
-			variables.testSpecs.addAll( listToArray( arguments.testMethod ) );
+			variables.testSpecs.append( listToArray( arguments.testMethod ), true );
 		}
 		return new Results( variables.bundles, variables.testSpecs );
 	}

diff --git a/system/reports/BaseReporter.cfc b/system/reports/BaseReporter.cfc
@@ -18,7 +18,7 @@ component {
 	 */
 	function getPageContextResponse(){
 		// If running in CLI mode, we don't have a page context
-		if ( !getFunctionList().keyExists( "pageContext" ) ) {
+		if ( !getFunctionList().keyExists( "getPageContext" ) ) {
 			return {
 				"setContentType" : function(){
 					// do nothing

diff --git a/system/runners/BDDRunner.cfc b/system/runners/BDDRunner.cfc
@@ -197,7 +197,7 @@ component
 		// Build labels from nested suites, so suites inherit from parent suite labels
 		var parentSuite        = arguments.suite;
 		while ( !isSimpleValue( parentSuite ) ) {
-			consolidatedLabels.addAll( parentSuite.labels );
+			consolidatedLabels.append( parentSuite.labels, true );
 			parentSuite = parentSuite.parentref;
 		}
 

diff --git a/tests/runners/mxunit/compat-testsuites.cfm b/tests/runners/mxunit/compat-testsuites.cfm
@@ -1,6 +1,6 @@
 <cfsetting showdebugoutput="false" >
 <cfset suite = new testbox.system.compat.framework.TestSuite().TestSuite()>
-<cfset suite.addAll( "testbox.tests.specs.MXUnitCompatTest" )>
+<cfset suite.append( "testbox.tests.specs.MXUnitCompatTest" )>
 <cfset r = suite.run()>
 <cfoutput>#r.getResultsOutput( reporter="simple" )#</cfoutput>