Skip to content

Commit 74731a4

Browse files
committed
fixing tests
1 parent ce5299e commit 74731a4

File tree

5 files changed

+19
-19
lines changed

5 files changed

+19
-19
lines changed

.cfconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"class":"${DB_CLASS}",
4141
"dbdriver": "MySQL",
4242
"dsn":"jdbc:mysql://{host}:{port}/{database}",
43-
"custom":"useUnicode=true&characterEncoding=UTF8&serverTimezone=UTC&useLegacyDatetimeCode=true&autoReconnect=true&useSSL=false",
43+
"custom":"useUnicode=true&characterEncoding=UTF8&serverTimezone=UTC&useLegacyDatetimeCode=true&autoReconnect=true&useSSL=false&allowPublicKeyRetrieval=true",
4444
"host":"${DB_HOST:127.0.0.1}",
4545
"username": "${DB_USER}",
4646
"password": "${DB_PASSWORD}",

server-adobe@2023.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
"JVM":{
2222
"heapSize":"1024"
2323
},
24-
"cfconfig": {
25-
"file" : ".cfconfig.json"
26-
},
27-
"scripts" : {
28-
"onServerInstall":"cfpm install caching,zip,orm,mysql,postgresql,sqlserver,document,feed,mail,debugger"
29-
}
24+
"cfconfig":{
25+
"file":".cfconfig.json"
26+
},
27+
"scripts":{
28+
"onServerInstall":"cfpm install caching,zip,orm,mysql,postgresql,sqlserver,document,feed,mail,debugger"
29+
}
3030
}

system/core/util/CFMLEngine.cfc

+7-7
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,20 @@ component {
3333
/**
3434
* Returns the current running CFML major version level
3535
*/
36-
numeric function getVersion(){
37-
return listFirst( getFullVersion(), "." );
36+
function getVersion(){
37+
return listFirst( getFullVersion(), "," );
3838
}
3939

4040
/**
4141
* Returns the current running CFML full version
4242
*/
43-
string function getFullVersion(){
43+
function getFullVersion(){
4444
switch ( getEngine() ) {
45-
case this.adobe:
45+
case "adobe":
4646
return server.coldfusion.productVersion;
47-
case this.lucee:
47+
case "lucee":
4848
return server.lucee.version;
49-
case this.boxlang:
49+
case "boxlang":
5050
return server.boxlang.version;
5151
}
5252
}
@@ -90,7 +90,7 @@ component {
9090
/**
9191
* Discover the running engine slug for feature checks
9292
*
93-
* @return lucee, adobe{version}
93+
* @return lucee, adobe{version}, boxlang
9494
*/
9595
string function getFeatureEngineSlug(){
9696
var engine = getEngine();

tests/index.cfm

+2-2
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,9 @@
8686
</p>
8787
8888
<cfset runners = directoryList( expandPath( "./" ), false, "query", "runner*.cfm" )>
89-
<cfoutput query="runners">
89+
<cfloop query="runners">
9090
<a href="#runners.name#" target="_blank" class="btn btn-secondary btn-sm my-1 mx-1">#runners.name#</a>
91-
</cfoutput>
91+
</cfloop>
9292
</div>
9393
</div>
9494

tests/specs/core/util/CFMLEngineTest.cfc

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
}
66

77
function testGetVersion(){
8-
expect( target.getVersion() ).toBeNumeric();
8+
expect( target.getVersion() ).toBeNumeric( target.getVersion() );
99
}
1010

1111
function testGetFullVersion(){
12-
expect( target.getFullVersion() ).toBeString();
12+
expect( target.getFullVersion() ).toBeString( target.getFullVersion() );
1313
}
1414

1515
function testGetEngine(){
16-
expect( target.getEngine() ).toBeString();
16+
expect( target.getEngine() ).toBeString( target.getEngine() );
1717
}
1818

1919
}

0 commit comments

Comments
 (0)