From 7f312f6e271e2ff549a1d3bdcb9b6b42cd3d7e23 Mon Sep 17 00:00:00 2001 From: Github Actions Date: Fri, 27 Sep 2024 15:31:21 +0000 Subject: [PATCH 1/5] Version bump --- box.json | 2 +- changelog.md | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/box.json b/box.json index b328692..591fa9d 100644 --- a/box.json +++ b/box.json @@ -1,6 +1,6 @@ { "name":"TestBox", - "version":"6.0.0", + "version":"6.1.0", "location":"https://downloads.ortussolutions.com/ortussolutions/testbox/@build.version@/testbox-@build.version@.zip", "author":"Ortus Solutions ", "slug":"testbox", diff --git a/changelog.md b/changelog.md index 21ccb5f..c5bf9ae 100644 --- a/changelog.md +++ b/changelog.md @@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [6.0.0] - 2024-09-27 + ### New Features - TESTBOX-391 MockBox converted to script @@ -37,3 +39,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Tasks - TESTBOX-400 Drop Adobe 2018 support + +[Unreleased]: https://github.com/Ortus-Solutions/TestBox/compare/v6.0.0...HEAD + +[6.0.0]: https://github.com/Ortus-Solutions/TestBox/compare/bc7774b4cc681cd8dfab08b2f3bba26a75f5601b...v6.0.0 From 9de94875e671b84847ec21e96c3ea7c9ff2314c5 Mon Sep 17 00:00:00 2001 From: Luis Majano Date: Fri, 27 Sep 2024 09:35:21 -0600 Subject: [PATCH 2/5] small typo --- Application.cfc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application.cfc b/Application.cfc index 7a882d5..faf12c7 100644 --- 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() ); From bfe8100ad84c485110cac41469b575651c4a43d1 Mon Sep 17 00:00:00 2001 From: Luis Majano Date: Sat, 28 Sep 2024 10:08:06 -0700 Subject: [PATCH 3/5] TESTBOX-404 #resolve The identification of the web pageContext had a typo: getpageContext insted of just pagecontext for BoxLang detection --- system/reports/BaseReporter.cfc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/reports/BaseReporter.cfc b/system/reports/BaseReporter.cfc index bcd7076..41c86bb 100644 --- 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 From 66b3ebc75628b288a0caf1be74c22552406dc041 Mon Sep 17 00:00:00 2001 From: Luis Majano Date: Sat, 28 Sep 2024 10:11:59 -0700 Subject: [PATCH 4/5] patch version --- box.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/box.json b/box.json index 591fa9d..f6b079e 100644 --- a/box.json +++ b/box.json @@ -1,6 +1,6 @@ { "name":"TestBox", - "version":"6.1.0", + "version":"6.0.1", "location":"https://downloads.ortussolutions.com/ortussolutions/testbox/@build.version@/testbox-@build.version@.zip", "author":"Ortus Solutions ", "slug":"testbox", From 42ec0648cc88cf715a3691606cee0aaaa638cd8e Mon Sep 17 00:00:00 2001 From: Zac Spitzer Date: Thu, 28 Nov 2024 14:47:16 +0100 Subject: [PATCH 5/5] switch from java method addAll() to cfml function array.Append() --- system/BaseSpec.cfc | 4 ++-- system/TestBox.cfc | 8 ++++---- system/compat/framework/TestSuite.cfc | 6 +++--- system/runners/BDDRunner.cfc | 2 +- tests/runners/mxunit/compat-testsuites.cfm | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/system/BaseSpec.cfc b/system/BaseSpec.cfc index 835e3ae..5552e60 100644 --- 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 index 7fb97bd..9894d0f 100644 --- 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 index a29f0be..f15112c 100644 --- 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/runners/BDDRunner.cfc b/system/runners/BDDRunner.cfc index a93d1bd..5cba6d9 100644 --- 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 index 104045c..af6a9b8 100644 --- a/tests/runners/mxunit/compat-testsuites.cfm +++ b/tests/runners/mxunit/compat-testsuites.cfm @@ -1,6 +1,6 @@ - + #r.getResultsOutput( reporter="simple" )#