Skip to content

Commit

Permalink
updating for more tests
Browse files Browse the repository at this point in the history
  • Loading branch information
lmajano committed Jan 16, 2025
1 parent b8265b5 commit 6dab084
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 15 deletions.
8 changes: 4 additions & 4 deletions [email protected]
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"app":{
"cfengine":"boxlang@be",
"cfengine":"/Users/lmajano/Sites/projects/boxlang-servlet/build/distributions/boxlang-servlet-1.0.0-snapshot.zip",
"serverHomeDirectory":".engine/boxlang"
},
"name":"coldbox-boxlang",
Expand All @@ -20,8 +20,8 @@
},
"JVM":{
"heapSize":"1024",
"javaVersion":"openjdk21_jre",
"args": "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=9999"
"javaVersion":"openjdk21_jre",
"args":"-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=9999"
},
"cfconfig":{
"file":".cfconfig.json"
Expand All @@ -30,6 +30,6 @@
"BOXLANG_DEBUG":true
},
"scripts":{
"onServerInitialInstall":"install bx-mail,bx-pdf,bx-mysql,bx-derby,bx-compat-cfml,bx-unsafe-evaluate,bx-esapi --noSave"
"onServerInitialInstall":"install bx-mail,bx-pdf@be,bx-mysql,bx-derby,bx-compat-cfml,bx-unsafe-evaluate,bx-esapi --noSave"
}
}
8 changes: 4 additions & 4 deletions tests/specs/integration/EventCachingSpec.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@
data = { format : thisFormat },
body = function( data ){
// TODO: Jon Clausen waiting for a fix on the PDF rendering
if ( data.format == "pdf" && isBoxLang() ) {
// Skip PDF tests
return;
}
// if ( data.format == "pdf" && isBoxLang() ) {
// // Skip PDF tests
// return;
// }

getRequestContext().setValue( "format", data.format );
var event = execute( event = "eventcaching", renderResults = true );
Expand Down
2 changes: 1 addition & 1 deletion tests/suites/loadtests/beload/Application.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ component{
// Application properties
this.name = hash( getCurrentTemplatePath() );
this.sessionManagement = true;
this.sessionTimeout = createTimeSpan(0,0,30,0);
this.sessionTimeout = createTimeSpan(0,0,5,0);
this.setClientCookies = true;

// COLDBOX STATIC PROPERTY, DO NOT CHANGE UNLESS THIS IS NOT THE ROOT OF YOUR COLDBOX APP
Expand Down
5 changes: 2 additions & 3 deletions tests/suites/loadtests/beload/layouts/Main.cfm
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<meta name="description" content="ColdBox Application Template">
<meta name="author" content="Ortus Solutions, Corp">

<!---Base URL --->
<base href="#event.getHTMLBaseURL()#" />
<!---Base URL
<base href="#event.getHTMLBaseURL()#" />--->

<!---css --->
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
Expand Down Expand Up @@ -85,7 +85,6 @@
<hr class="dropdown-divider">
</li>
<li class="p-2">
<img class="rounded mx-auto block" width="150" src="includes/images/ColdBoxLogo2015_300.png" alt="logo"/>
</li>
</ul>
</li>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"app":{
"cfengine":"adobe@2021"
"cfengine":"adobe@2023"
},
"name":"beload-acf2021",
"name":"beload-acf2023",
"JVM":{
"heapSize":"512"
},
Expand Down
21 changes: 21 additions & 0 deletions tests/suites/loadtests/beload/[email protected]
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"app":{
"cfengine":"boxlang@be"
},
"name":"beload-boxlang",
"JVM":{
"heapSize":"512",
"javaVersion":"openjdk21_jre"
},
"web":{
"rewrites":{
"enable":"false"
},
"http":{
"port":"8701"
}
},
"scripts":{
"onServerInitialInstall":"install bx-compat-cfml --noSave"
}
}
1 change: 0 additions & 1 deletion tests/suites/loadtests/beload/views/main/index.cfm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<div class="text-center card shadow-sm bg-light border border-5 border-white">
<div class="card-body">
<div>
<img src="includes/images/ColdBoxLogo2015_300.png" class="m-2 mt-2" alt="logo" height="200"/>
</div>
<div class="badge bg-info mb-2">
<strong>#getColdBoxSetting( "version" )# (#getColdBoxSetting( "suffix" )#)</strong>
Expand Down

0 comments on commit 6dab084

Please sign in to comment.