Merge branch 'development'

.github/workflows/release.yml

@@ -57,7 +57,7 @@ jobs:
         if: env.SNAPSHOT == 'false'
         with:
           changelogPath: ./changelog.md
-          tag: v${{ env.VERSION }}
+          tag: v${{ env.TESTBOX_VERSION }}
 
       - name: Build TestBox for ${{ env.BRANCH }} v${{ env.TESTBOX_VERSION }}
         run: |
@@ -72,16 +72,16 @@ jobs:
         with:
           author_name: Github Actions
           author_email: info@ortussolutions.com
-          message: 'Finalized changelog for v${{ env.VERSION }}'
+          message: 'Finalized changelog for v${{ env.TESTBOX_VERSION }}'
           add: changelog.md
 
       - name: Tag Version
         uses: rickstaa/action-create-tag@v1.6.1
         if: env.SNAPSHOT == 'false'
         with:
-          tag: "v${{ env.VERSION }}"
+          tag: "v${{ env.TESTBOX_VERSION }}"
           force_push_tag: true
-          message: "Latest Release v${{ env.VERSION }}"
+          message: "Latest Release v${{ env.TESTBOX_VERSION }}"
 
       - name: Upload Build Artifacts
         if: success()
@@ -125,10 +125,10 @@ jobs:
         continue-on-error: true
         if: env.SNAPSHOT == 'false'
         with:
-          title: ${{ env.VERSION }}
+          title: ${{ env.TESTBOX_VERSION }}
           changelog: changelog.md
           token: ${{ secrets.GITHUB_TOKEN }}
-          ref: refs/tags/v${{ env.VERSION }}
+          ref: refs/tags/v${{ env.TESTBOX_VERSION }}
 
       - name: Inform Slack
         if: ${{ always() }}

.markdownlint.json

@@ -10,5 +10,6 @@
 	},
 	"no-duplicate-header" : {
 		"siblings_only" : true
-	}
+	},
+	"no-inline-html" : false
 }

box.json

@@ -1,6 +1,6 @@
 {
     "name":"TestBox",
-    "version":"5.0.0",
+    "version":"5.1.0",
     "location":"https://downloads.ortussolutions.com/ortussolutions/testbox/@build.version@/testbox-@build.version@.zip",
     "author":"Ortus Solutions <info@ortussolutions.com>",
     "slug":"testbox",
@@ -36,19 +36,19 @@
         "watchDelay":"250"
     },
     "dependencies":{
-        "cbstreams":"^1.5.0",
-        "mockdatacfc":"^3.3.0+22",
-        "globber": "^3.1.3"
+        "cbstreams":"^2.0.0",
+        "mockdatacfc":"^3",
+        "globber":"^3.1.3"
     },
-	"devDependencies":{
+    "devDependencies":{
         "commandbox-dotenv":"*",
         "commandbox-cfconfig":"*",
         "commandbox-cfformat":"*"
     },
     "installPaths":{
         "cbstreams":"system/modules/cbstreams/",
         "mockdatacfc":"system/modules/mockdatacfc/",
-        "globber": "system/modules/globber/"
+        "globber":"system/modules/globber/"
     },
     "scripts":{
         "release":"recipe build/release.boxr",
@@ -58,7 +58,7 @@
         "start:lucee":"server start serverConfigFile=server-lucee@5.json",
         "start:2018":"server start serverConfigFile=server-adobe@2018.json",
         "start:2021":"server start serverConfigFile=server-adobe@2021.json",
-		"log:lucee":"server log testbox-lucee@5 --follow",
+        "log:lucee":"server log testbox-lucee@5 --follow",
         "log:2018":"server log testbox-adobe@2018 --follow",
         "log:2021":"server log testbox-adobe@2021 --follow"
     }

changelog.md

@@ -9,7 +9,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-## [] - 2023-05-10
+### Added
+
+- Update to `cbstreams` 2.x series for compat purposes.
+
+### Fixed
+
+- Small regresion on [TESTBOX-370](https://ortussolutions.atlassian.net/browse/TESTBOX-370) `toHaveKey` works on queries in Lucee but not ColdFusion
+
+## [5.0.0] - 2023-05-10
 
 ### Fixed
 
@@ -44,3 +52,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [Unreleased]: https://github.com/Ortus-Solutions/TestBox/compare/v...HEAD
 
 []: https://github.com/Ortus-Solutions/TestBox/compare/9f820840b1012dd89b79c62494333d4117bc1a7c...v
+
+[Unreleased]: https://github.com/Ortus-Solutions/TestBox/compare/v...HEAD
+
+[]: https://github.com/Ortus-Solutions/TestBox/compare/9f820840b1012dd89b79c62494333d4117bc1a7c...v

readme.md

@@ -82,11 +82,11 @@ directory you installed TestBox and create the mapping `/testbox` that points to
 
 You can also use [CommandBox](https://www.ortussolutions.com/products/commandbox) to install and leverage TestBox for commandline executions, test generations, watchers and much more:
 
-**Stable Release**
+### Stable Release
 
 `box install testbox`
 
-**Bleeding Edge Release**
+### Bleeding Edge Release
 
 `box install testbox@be`
 

server-lucee@6.json

@@ -9,7 +9,7 @@
         }
     },
     "app":{
-        "cfengine":"lucee@6.0.0-BETA+346",
+        "cfengine":"lucee@6.0.0-SNAPSHOT",
         "serverHomeDirectory":".engine/lucee6"
     },
     "cfconfig":{

system/Assertion.cfc

@@ -1244,7 +1244,8 @@ component {
 		}
 		if ( isQuery( arguments.target ) ) {
 			return getMetadata( arguments.target ).reduce( ( results, item ) => {
-				results[ item.name ] = {}
+				results[ item.name ] = {};
+				return results;
 			}, {} );
 		}
 		throw( "InvalidTargetType", "The target is not a struct or query" );

tests/coverageReport.json

@@ -0,0 +1 @@
+{"COLUMNS":["filePath","relativeFilePath","filePathHash","numLines","numCoveredLines","numExecutableLines","percCoverage","lineData"],"DATA":[["/Users/lmajano/Sites/projects/TestBox/tests/CoverageReporterTest.cfc","CoverageReporterTest.cfc","B506E28C0CC6B7939E1A86ED7ACDA3B2",3,2,0,1,{"2":"1","1":1}],["/Users/lmajano/Sites/projects/TestBox/tests/CoverageServiceTest.cfc","CoverageServiceTest.cfc","7F968BF64B0F50B6BA8988D55B3B17EE",3,0,0,1,{}]]}