Skip to content

Commit ae46072

Browse files
authored
chore(CI): Boxlang in CI
1 parent 8a84363 commit ae46072

4 files changed

Lines changed: 18 additions & 4 deletions

File tree

.github/workflows/tests.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
strategy:
1212
fail-fast: false
1313
matrix:
14-
cfengine: ["lucee@5", "adobe@2018", "adobe@2021", "adobe@2023"]
14+
cfengine: ["lucee@5", "adobe@2018", "adobe@2021", "adobe@2023", "boxlang@be"]
1515
coldbox: ["coldbox@6", "coldbox@7"]
1616
steps:
1717
- name: Checkout Repository
@@ -31,7 +31,12 @@ jobs:
3131
box install ${{ matrix.coldbox }} --noSave
3232
3333
- name: Start server
34-
run: box server start cfengine=${{ matrix.cfengine }} --noSaveSettings
34+
run: |
35+
box server start cfengine=${{ matrix.cfengine }} --noSaveSettings
36+
if [[ "${{ matrix.cfengine }}" == *"boxlang"* ]] ; then
37+
box run-script bx-modules:install
38+
box server restart
39+
fi
3540
3641
- name: Run TestBox Tests
3742
run: box testbox run

box.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"globber":"^3.1.5"
2525
},
2626
"devDependencies":{
27-
"testbox":"^5.0.0",
27+
"testbox":"^6.0.0",
2828
"coldbox":"^7.0.0"
2929
},
3030
"installPaths":{
@@ -35,7 +35,8 @@
3535
"scripts":{
3636
"format":"cfformat run ModuleConfig.cfc,models/**/*.cfc,tests/specs/**/*.cfc,tests/resources/app/handlers/**/*.cfc,tests/resources/app/config/**/*.cfc --overwrite",
3737
"format:check":"cfformat check ModuleConfig.cfc,models/**/*.cfc,tests/specs/**/*.cfc,tests/resources/app/handlers/**/*.cfc,tests/resources/app/config/**/*.cfc --verbose",
38-
"format:watch":"cfformat watch ModuleConfig.cfc,models/**/*.cfc,tests/specs/**/*.cfc,tests/resources/app/handlers/**/*.cfc,tests/resources/app/config/**/*.cfc"
38+
"format:watch":"cfformat watch ModuleConfig.cfc,models/**/*.cfc,tests/specs/**/*.cfc,tests/resources/app/handlers/**/*.cfc,tests/resources/app/config/**/*.cfc",
39+
"bx-modules:install": "install bx-compat-cfml@be,bx-esapi"
3940
},
4041
"ignore":[
4142
"**/.*",

tests/specs/integration/AsyncSpec.cfc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ component extends="tests.resources.ModuleIntegrationSpec" appMapping="/app" {
99
function run() {
1010
describe( "async requests", function() {
1111
it( "can send a request asynchronously", function() {
12+
if ( isBoxLang() ) {
13+
return skip( "Variadic parameters are not yet supported in BoxLang." );
14+
}
15+
1216
var future = hyper.setUrl( "https://jsonplaceholder.typicode.com/posts/1" ).sendAsync();
1317
expect( future ).toBeInstanceOf( "Future", "A Future object should have been returned." );
1418
var res = future.get();

tests/specs/integration/FileUploadsSpec.cfc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ component extends="tests.resources.ModuleIntegrationSpec" appMapping="/app" {
1515
} );
1616

1717
it( "can attach files", function() {
18+
if ( isBoxLang() ) {
19+
return skip( "File uploads work but have a bug that prevents it from passing on the first time." );
20+
}
21+
1822
var res = hyper
1923
.attach(
2024
"smallPhoto",

0 commit comments

Comments
 (0)