Skip to content

Commit e956872

Browse files
committed
Merge branch 'development'
2 parents 69e6f27 + 0e47f31 commit e956872

64 files changed

Lines changed: 6047 additions & 899 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ jobs:
9494

9595
- name: Upload Build Artifacts
9696
if: success()
97-
uses: actions/upload-artifact@v6
97+
uses: actions/upload-artifact@v7
9898
with:
9999
name: testbox
100100
path: |
@@ -130,7 +130,7 @@ jobs:
130130
box forgebox publish --force
131131
132132
- name: Create Github Release
133-
uses: taiki-e/create-gh-release-action@v1.9.1
133+
uses: taiki-e/create-gh-release-action@v1.9.2
134134
continue-on-error: true
135135
if: env.SNAPSHOT == 'false'
136136
with:
@@ -172,7 +172,7 @@ jobs:
172172
forgeboxAPIKey: ${{ secrets.FORGEBOX_TOKEN }}
173173

174174
- name: Download build artifacts
175-
uses: actions/download-artifact@v7
175+
uses: actions/download-artifact@v8
176176
with:
177177
name: testbox
178178
path: .tmp

.github/workflows/tests.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,6 @@ jobs:
2222
jdkVersion: [ "21" ]
2323
experimental: [ false ]
2424
include:
25-
# Old Supported One
26-
- cfengine: "adobe@2021"
27-
commandbox_version: "6.3.1"
28-
jdkVersion: "11"
29-
experimental: false
3025
- cfengine: "boxlang@be"
3126
commandbox_version: "6.3.1"
3227
jdkVersion: "21"
@@ -69,7 +64,7 @@ jobs:
6964

7065
- name: Upload Test Results Artifacts
7166
if: always()
72-
uses: actions/upload-artifact@v6
67+
uses: actions/upload-artifact@v7
7368
with:
7469
name: testbox-test-results-${{ matrix.cfengine }}-${{ matrix.jdkVersion }}
7570
path: |
@@ -82,7 +77,7 @@ jobs:
8277
8378
- name: Upload Debugging Info To Artifacts
8479
if: ${{ failure() }}
85-
uses: actions/upload-artifact@v6
80+
uses: actions/upload-artifact@v7
8681
with:
8782
name: Failure Debugging Info - ${{ matrix.cfengine }} - ${{ matrix.jdkVersion }}
8883
path: |

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
.settings/
55
.engine/
66
grapher/**
7+
.idea/
78

89
# Test Results
910
tests/results/**

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ Please make sure your code runs on the following engines:
6969

7070
- BoxLang 1+
7171
- Lucee 5+
72-
- Adobe ColdFusion 2021+
72+
- Adobe ColdFusion 2023+
7373

7474
## Coding Styles & Formatting
7575

box.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"name":"TestBox",
3-
"version":"6.5.0",
3+
"version":"7.0.0",
44
"location":"https://downloads.ortussolutions.com/ortussolutions/testbox/@build.version@/testbox-@build.version@.zip",
55
"author":"Ortus Solutions <info@ortussolutions.com>",
66
"slug":"testbox",
77
"type":"testing",
8-
"keywords":"testing,xunit,bdd,testbox,mxunit,tdd",
8+
"keywords":"testing,xunit,bdd,testbox,tdd",
99
"homepage":"https://www.ortussolutions.com/products/testbox",
1010
"documentation":"https://testbox.ortusbooks.com",
1111
"repository":{

bx/browser/index.bxm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<bx:script>
22
// GLOBAL VARIABLES
33
ASSETS_DIR = expandPath( "/testbox/system/reports/assets" );
4-
TESTBOX_VERSION = new testBox.system.TestBox().getVersion();
4+
TESTBOX_VERSION = new testbox.system.TestBox().getVersion();
55
// TEST LOCATIONS -> UPDATE AS YOU SEE FIT
66
rootMapping = "/tests/";
77

bx/runner/Application.bx

Lines changed: 0 additions & 29 deletions
This file was deleted.

bx/runner/index.bxm

Lines changed: 0 additions & 193 deletions
This file was deleted.

bx/tests/Application.bx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@
66
* to a root application. Usually you mimic your application's Application.bx settings here.
77
*/
88
class {
9-
this.name = "My Test Harness";
10-
9+
// Harness name
10+
this.name = "My Test Harness"
1111
// The mapping to easily access the tests
12-
this.mappings[ "/tests" ] = getDirectoryFromPath( getCurrentTemplatePath() );
12+
this.mappings[ "/tests" ] = getDirectoryFromPath( getCurrentTemplatePath() )
1313
// The mapping to easily access the root application usually the parent folder
14-
this.mappings[ "/root" ] = expandPath( "/../" );
14+
this.mappings[ "/root" ] = expandPath( "/../" )
1515

1616
// Any application settings go here
1717

1818
/**
1919
* Executes BEFORE any runner or test requested.
2020
*/
2121
boolean function onRequestStart( String targetPage ){
22-
return true;
22+
return true
2323
}
2424

2525
/**

0 commit comments

Comments
 (0)