Merge pull request #165 from Ortus-Solutions/development

v6.2.0

Author: lmajano

.github/workflows/release.yml

@@ -17,13 +17,16 @@ on:
         default: false
         type: boolean
 
+  # Manual Trigger for manual releases
+  workflow_dispatch:
+
 env:
   SNAPSHOT: ${{ inputs.snapshot || false }}
 
 jobs:
   build:
     name: Build & Publish Release
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4
@@ -32,7 +35,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: "temurin"
-          java-version: "11"
+          java-version: "17"
 
       - name: Setup CommandBox
         uses: Ortus-Solutions/setup-commandbox@v2.0.1
@@ -50,6 +53,7 @@ jobs:
           if [ $GITHUB_REF == 'refs/heads/development' ]
           then
             echo "BRANCH=development" >> $GITHUB_ENV
+            echo "TESTBOX_VERSION=${TESTBOX_VERSION}-snapshot" >> $GITHUB_ENV
           fi
 
       - name: Update changelog [unreleased] with latest version

.github/workflows/snapshot.yml

@@ -5,6 +5,11 @@ on:
     branches:
       - development
 
+# Unique group name per workflow-branch/tag combo
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   #############################################
   # Tests First baby! We fail, no build :(

.github/workflows/tests.yml

@@ -16,22 +16,15 @@ jobs:
       fail-fast: false
       matrix:
         commandbox_version: [ "6.1.0" ]
-        cfengine: [ "lucee@5", "lucee@6", "adobe@2021", "adobe@2023" ]
-        jdkVersion: [ "11" ]
-        experimental: [false]
+        cfengine: [ "boxlang@1", "boxlang-cfml@1", "lucee@5", "lucee@6", "adobe@2023" ]
+        jdkVersion: [ "21" ]
+        experimental: [ false ]
         include:
-          - cfengine: "boxlang@1"
+          # Old Supported One
+          - cfengine: "adobe@2021"
             commandbox_version: "6.1.0"
-            jdkVersion: "21"
+            jdkVersion: "11"
             experimental: false
-          - cfengine: "lucee@6"
-            commandbox_version: "6.1.0"
-            jdkVersion: "21"
-            experimental: true
-          - cfengine: "adobe@2023"
-            commandbox_version: "6.1.0"
-            jdkVersion: "21"
-            experimental: true
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4

.gitignore

@@ -21,3 +21,4 @@ build/build.number
 bx/testbox
 bx/grapher
 cfml/testbox
+tests/coverageReport.json

Application.cfc

@@ -1,6 +1,6 @@
 {
     "name":"TestBox",
-    "version":"6.1.0",
+    "version":"6.2.0",
     "location":"https://downloads.ortussolutions.com/ortussolutions/testbox/@build.version@/testbox-@build.version@.zip",
     "author":"Ortus Solutions <info@ortussolutions.com>",
     "slug":"testbox",

box.json

@@ -150,7 +150,7 @@ component{
             .params(
 				path        = "/#variables.projectBuildDir#/**",
 				token       = ( arguments.branch == "master" ? "@build.number@" : "+@build.number@" ),
-                replacement = ( arguments.branch == "master" ? arguments.buildID : "-snapshot" )
+                replacement = ( arguments.branch == "master" ? arguments.buildID : "" )
             )
             .run();
 

build/Build.cfc

@@ -1,6 +1,5 @@
 <p align="center">
-	<img src="https://www.ortussolutions.com/__media/testbox-185.png">
-	<img src="https://www.ortussolutions.com/__media/mockbox-185.png">
+	<img src="https://raw.githubusercontent.com/Ortus-Solutions/artwork/refs/heads/main/testbox/banners/testbox-site-banner.png" alt="TESTBOX"/>
 </p>
 
 <p align="center">
@@ -17,7 +16,36 @@
 
 ----
 
-TestBox is a Behavior Driven Development (BDD) and Test Driven Development (TDD) framework for [BoxLang JVM Language](https://www.boxlang.io) and ColdFusion (CFML). It also includes mocking and stubbing capabilities via its internal MockBox library.
+> TestBox v6 Now Available: **[Read the announcement »](https://testbox.ortusbooks.com/readme/release-history/whats-new-with-6.0.0)**.
+
+
+TestBox is a Behavior Driven Development (BDD) and Test Driven Development (TDD) framework for [BoxLang JVM Language](https://www.boxlang.io) and ColdFusion (CFML). It also includes mocking and stubbing capabilities via its internal MockBox library.  We also recommend you install the `testbox-cli` (https://www.forgebox.io/view/testbox-cli) package to leverage commandline test runners, test generations and watchers using CommandBox.
+
+## Requirements
+
+* BoxLang 1+
+* Lucee 5+
+* Adobe ColdFusion 2021+
+
+## Installation
+
+You can visit the TestBox documentation page to view all of its features and
+capabilities.  To install TestBox just drop it in your web root as `/testbox` or
+create a mapping `/testbox` that points to it.
+
+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
+
+```bash
+box install testbox-cli testbox
+```
+
+### Bleeding Edge Release
+
+`box install testbox@be`
+
+Bleeding edge builds are updated automatically as code is committed.
 
 ## License
 
@@ -66,32 +94,9 @@ Join us in our Ortus Community and become a valuable member of this project [Tes
 
 ### Official Site
 
+* https://www.testbox.run
 * https://www.ortussolutions.com/products/testbox
 
-## Requirements
-
-* BoxLang 1+
-* Lucee 5+
-* Adobe ColdFusion 2021+
-
-## Installation
-
-You can visit the TestBox documentation page to view all of its features and
-capabilities.  To install TestBox just drop it in your web root as `/testbox` or
-create a mapping `/testbox` that points to it.
-
-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
-
-`box install testbox`
-
-### Bleeding Edge Release
-
-`box install testbox@be`
-
-Bleeding edge builds are updated automatically as code is committed.
-
 ----
 
 ### HONOR GOES TO GOD ABOVE ALL

readme.md

@@ -0,0 +1,28 @@
+{
+	"name":"testbox-boxlang",
+	"force":true,
+	"openBrowser":false,
+	"web":{
+        "directoryBrowsing":true,
+        "http":{
+            "port":"49616"
+        }
+    },
+    "app":{
+        "cfengine":"boxlang@be",
+        "serverHomeDirectory":".engine/boxlang"
+    },
+    "JVM":{
+        "javaVersion":"openjdk21_jre",
+		"args": "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8888"
+    },
+    "cfconfig":{
+        "file":".cfconfig.json"
+    },
+    "env":{
+        "BOXLANG_DEBUG":true
+    },
+    "scripts":{
+        "onServerInitialInstall":"install bx-compat-cfml"
+    }
+}

server-boxlang-cfml@1.json

@@ -1,8 +1,8 @@
 {
-	"name":"testbox-boxlang",
-	"force":true,
-	"openBrowser":false,
-	"web":{
+    "name":"testbox-boxlang",
+    "force":true,
+    "openBrowser":false,
+    "web":{
         "directoryBrowsing":true,
         "http":{
             "port":"49616"
@@ -14,15 +14,13 @@
     },
     "JVM":{
         "javaVersion":"openjdk21_jre",
-		"args": "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8888"
+        "args":"-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8888"
     },
     "cfconfig":{
         "file":".cfconfig.json"
     },
     "env":{
         "BOXLANG_DEBUG":true
     },
-    "scripts":{
-        "onServerInitialInstall":"install bx-compat-cfml,bx-unsafe-evaluate"
-    }
+    "scripts":{}
 }