Skip to content

Commit 9b49f33

Browse files
committed
all tests green
1 parent 9fa4da7 commit 9b49f33

18 files changed

+2897
-21
lines changed

models/Loader.cfc

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@ component accessors="true" singleton {
7575
function create( required string className ){
7676
if ( isBoxLangNative() ) {
7777
return createObject(
78-
"java",
79-
arguments.className,
80-
getRequestClassLoader()
78+
type: "java",
79+
className: arguments.className,
80+
classLoader: getRequestClassLoader()
8181
);
8282
}
8383
return getJavaLoaderFromScope().create( argumentCollection = arguments );
@@ -135,14 +135,11 @@ component accessors="true" singleton {
135135
array function getLoadedURLs(){
136136
// BoxLang 1.8.0+: get URLs directly from the request class loader
137137
if ( isBoxLangNative() ) {
138-
var loadedURLs = getRequestClassLoader().getURLs();
139-
var returnArray = arrayNew( 1 );
140-
for ( var url in loadedURLs ) {
141-
arrayAppend( returnArray, url.toString() );
142-
}
143-
return returnArray;
138+
return getRequestClassLoader()
139+
.getURLs()
140+
.map( ( item ) => item.toString() )
144141
}
145-
142+
// None native: get URLs from JavaLoader's URLClassLoader
146143
var loadedURLs = getURLClassLoader().getURLs();
147144
var returnArray = arrayNew( 1 );
148145
var x = 1;

server-boxlang-cfml@1.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@
3131
"BOXLANG_DEBUG":true
3232
},
3333
"scripts":{
34-
"onServerInitialInstall":"install bx-compat-cfml --noSave"
34+
"onServerInitialInstall":"install bx-compat-cfml,bx-esapi --noSave"
3535
}
3636
}

server-boxlang@1.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@
3131
"BOXLANG_DEBUG":true
3232
},
3333
"scripts":{
34-
34+
"onServerInitialInstall":"install bx-esapi --noSave"
3535
}
3636
}

test-harness/box.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"private":true,
66
"description":"",
77
"dependencies":{
8-
"coldbox":"^7"
8+
"coldbox":"^8"
99
},
1010
"devDependencies":{
1111
"testbox":"*"

test-harness/config/Coldbox.cfc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
// Error/Exception Handling
2323
exceptionHandler : "",
2424
onInvalidEvent : "",
25-
customErrorTemplate : "/coldbox/system/exceptions/BugReport.cfm",
25+
customErrorTemplate : "/coldbox/system/exceptions/Whoops.cfm",
2626
// Application Aspects
2727
handlerCaching : false,
2828
eventCaching : false

test-harness/tests/Application.cfc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,9 @@ component {
6666

6767
// ORM Reload for fresh results
6868
if ( structKeyExists( url, "fwreinit" ) ) {
69-
if ( structKeyExists( server, "lucee" ) ) {
69+
if ( getFunctionList().keyExists( "pagePoolClear" ) ) {
7070
pagePoolClear();
7171
}
72-
// ormReload();
7372
request.coldBoxVirtualApp.restart();
7473
}
7574

0 commit comments

Comments
 (0)