Skip to content

Commit 30ddb04

Browse files
zainforbjszainforbjs
authored
Merge pull request #1870 from wheels-dev/wheels-fixes
Wheels fixes
2 parents 7d00f77 + e139b51 commit 30ddb04

File tree

10 files changed

+53
-34
lines changed

10 files changed

+53
-34
lines changed

‎cli/src/templates/BoxJSON.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"author":"Wheels Core Team and Community, repackaged by Peter Amiri",
55
"shortDescription":"Wheels MVC Framework Base Template",
66
"location":"",
7-
"slug":"myapp",
7+
"slug":"|appName|",
88
"createPackageDirectory":false,
99
"type":"wheels-templates",
1010
"keywords":[

‎cli/src/templates/ServerJSON.txt‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
{
22
"name": "|appName|",
3-
"app": {
4-
"cfengine": "|setEngine|",
5-
"serverHomeDirectory": ".wheels/server"
6-
},
73
"web": {
4+
"host":"localhost",
85
"webroot": "public",
96
"rewrites": {
107
"enable": true,
118
"config": "public/urlrewrite.xml"
129
}
10+
},
11+
"app": {
12+
"cfengine": "|setEngine|",
13+
"serverHomeDirectory": ".wheels/server",
14+
"libDirs":"app/lib"
1315
}
1416
}

‎core/src/wheels/tests_testbox/html.cfm‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,11 @@
153153

154154
<cfoutput>
155155
<cfinclude template="/wheels/public/layout/_header.cfm">
156+
<cfif get("URLRewriting") eq 'On'>
157+
<cfset queryStringSeparator='?'>
158+
<cfelse>
159+
<cfset queryStringSeparator='&'>
160+
</cfif>
156161
<div class="ui container">
157162

158163
#pageHeader(title="TestBox #type# Test Results")#
@@ -193,8 +198,8 @@
193198
<tbody>
194199
<cfloop array="#failures#" index="result">
195200
<tr class="error">
196-
<td><a href="?method=runRemote&testBundles=#result.packageName#&#_baseParams#">#result.cleanTestCase#</a></td>
197-
<td><a href="?method=runRemote&testSpecs=#structKeyExists(result, 'testId') AND len(result.testId) ? result.testId : ReplaceNoCase(result.testName,' ','%20','all')#&testBundles=#result.packageName#&#_baseParams#">#result.cleanTestName#</a></td>
201+
<td><a href="#URLFor(route = route)##queryStringSeparator#method=runRemote&testBundles=#result.packageName#&#_baseParams#">#result.cleanTestCase#</a></td>
202+
<td><a href="#URLFor(route = route)##queryStringSeparator#method=runRemote&testSpecs=#structKeyExists(result, 'testId') AND len(result.testId) ? result.testId : ReplaceNoCase(result.testName,' ','%20','all')#&testBundles=#result.packageName#&#_baseParams#">#result.cleanTestName#</a></td>
198203
<td class="n">#result.time#</td>
199204
<td class="failed">#result.status#</td>
200205
</tr>
@@ -205,8 +210,8 @@
205210

206211
<cfloop array="#skipped#" index="result">
207212
<tr>
208-
<td><a href="?directory=#result.packageName#&#_baseParams#">#result.cleanTestCase#</a></td>
209-
<td><a href="?directory=#result.packageName#&testSpecs=#result.testName#&#_baseParams#">#result.cleanTestName#</a></td>
213+
<td><a href="#URLFor(route = route)##queryStringSeparator#method=runRemote&testBundles=#result.packageName#&#_baseParams#">#result.cleanTestCase#</a></td>
214+
<td><a href="#URLFor(route = route)##queryStringSeparator#method=runRemote&testSpecs=#structKeyExists(result, 'testId') AND len(result.testId) ? result.testId : ReplaceNoCase(result.testName,' ','%20','all')#&testBundles=#result.packageName#&#_baseParams#">#result.cleanTestName#</a></td>
210215
<td class="n">#result.time#</td>
211216
<td>#result.status#</td>
212217
</tr>
@@ -232,8 +237,8 @@
232237
<cfif arraylen(errors) gt 0>
233238
<cfloop array="#errors#" index="result">
234239
<tr class="error">
235-
<td><a href="?method=runRemote&testBundles=#result.packageName#&#_baseParams#">#result.cleanTestCase#</a></td>
236-
<td><a href="?method=runRemote&testSpecs=#structKeyExists(result, 'testId') AND len(result.testId) ? result.testId : ReplaceNoCase(result.testName,' ','%20','all')#&testBundles=#result.packageName#&#_baseParams#">#result.cleanTestName#</a></td>
240+
<td><a href="#URLFor(route = route)##queryStringSeparator#method=runRemote&testBundles=#result.packageName#&#_baseParams#">#result.cleanTestCase#</a></td>
241+
<td><a href="#URLFor(route = route)##queryStringSeparator#method=runRemote&testSpecs=#structKeyExists(result, 'testId') AND len(result.testId) ? result.testId : ReplaceNoCase(result.testName,' ','%20','all')#&testBundles=#result.packageName#&#_baseParams#">#result.cleanTestName#</a></td>
237242
<td class="n">#result.time#</td>
238243
<td class="failed">#result.status#</td>
239244
</tr>
@@ -249,7 +254,7 @@
249254
<td colspan="4" class="failed">
250255
<strong>#bundle.name#</strong><br/>
251256
<em>Bundle has #bundle.totalError# error(s), but individual test details are not available in the TestBox results.</em><br/>
252-
<a href="?method=runRemote&testBundles=#bundle.name#&#_baseParams#">Re-run this bundle</a> to see detailed error information.
257+
<a href="#URLFor(route = route)##queryStringSeparator#method=runRemote&testBundles=#bundle.name#&#_baseParams#">Re-run this bundle</a> to see detailed error information.
253258
</td>
254259
</tr>
255260
</cfif>
@@ -272,17 +277,17 @@
272277
<tbody>
273278
<cfloop array="#passes#" index="result">
274279
<tr class="positive">
275-
<td><a href="?method=runRemote&testBundles=#result.packageName#&#_baseParams#">#result.cleanTestCase#</a></td>
276-
<td><a href="?method=runRemote&testSpecs=#structKeyExists(result, 'testId') AND len(result.testId) ? result.testId : ReplaceNoCase(result.testName,' ','%20','all')#&testBundles=#result.packageName#&#_baseParams#">#result.cleanTestName#</a></td>
280+
<td><a href="#URLFor(route = route)##queryStringSeparator#method=runRemote&testBundles=#result.packageName#&#_baseParams#">#result.cleanTestCase#</a></td>
281+
<td><a href="#URLFor(route = route)##queryStringSeparator#method=runRemote&testSpecs=#structKeyExists(result, 'testId') AND len(result.testId) ? result.testId : ReplaceNoCase(result.testName,' ','%20','all')#&testBundles=#result.packageName#&#_baseParams#">#result.cleanTestName#</a></td>
277282
<td class="n">#result.time#</td>
278283
<td class="success">#result.status#</td>
279284
</tr>
280285
</cfloop>
281286

282287
<cfloop array="#skipped#" index="result">
283288
<tr>
284-
<td><a href="?method=runRemote&testBundles=#result.packageName#&#_baseParams#">#result.cleanTestCase#</a></td>
285-
<td><a href="?method=runRemote&testSpecs=#structKeyExists(result, 'testId') AND len(result.testId) ? result.testId : ReplaceNoCase(result.testName,' ','%20','all')#&testBundles=#result.packageName#&#_baseParams#">#result.cleanTestName#</a></td>
289+
<td><a href="#URLFor(route = route)##queryStringSeparator#method=runRemote&testBundles=#result.packageName#&#_baseParams#">#result.cleanTestCase#</a></td>
290+
<td><a href="#URLFor(route = route)##queryStringSeparator#method=runRemote&testSpecs=#structKeyExists(result, 'testId') AND len(result.testId) ? result.testId : ReplaceNoCase(result.testName,' ','%20','all')#&testBundles=#result.packageName#&#_baseParams#">#result.cleanTestName#</a></td>
286291
<td class="n">#result.time#</td>
287292
<td>#result.status#</td>
288293
</tr>

‎docs/src/command-line-tools/commands/docker/docker-init.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -595,7 +595,13 @@ The command automatically updates your `server.json` with Docker-specific settin
595595
"web": {
596596
"host": "0.0.0.0",
597597
"http": {
598+
"enable": true,
598599
"port": "8080"
600+
},
601+
"webroot":"public",
602+
"rewrites":{
603+
"enable":true,
604+
"config":"public/urlrewrite.xml"
599605
}
600606
},
601607
"openBrowser": false,

‎examples/starter-app/app/snippets/BoxJSON.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"author":"Wheels Core Team and Community, repackaged by Peter Amiri",
55
"shortDescription":"Wheels MVC Framework Base Template",
66
"location":"",
7-
"slug":"myapp",
7+
"slug":"|appName|",
88
"createPackageDirectory":false,
99
"type":"wheels-templates",
1010
"keywords":[
@@ -35,7 +35,7 @@
3535
},
3636
"dependencies":{
3737
"wheels":"|version|",
38-
"orgh213172lex":"lex:https://ext.lucee.org/org.h2-1.3.172.lex"
38+
"orgh213172lex":"lex:https://ext.lucee.org/org.lucee.h2-2.1.214.0001L.lex"
3939
},
4040
"private":false,
4141
"license":[

‎examples/starter-app/app/snippets/ServerJSON.txt‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
{
22
"name": "|appName|",
3-
"app": {
4-
"cfengine": "|setEngine|",
5-
"serverHomeDirectory": ".wheels/server"
6-
},
73
"web": {
4+
"host":"localhost",
85
"webroot": "public",
96
"rewrites": {
107
"enable": true,
118
"config": "public/urlrewrite.xml"
129
}
10+
},
11+
"app": {
12+
"cfengine": "|setEngine|",
13+
"serverHomeDirectory": ".wheels/server",
14+
"libDirs":"app/lib"
1315
}
1416
}

‎examples/tweet/app/snippets/BoxJSON.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"author":"Wheels Core Team and Community, repackaged by Peter Amiri",
55
"shortDescription":"Wheels MVC Framework Base Template",
66
"location":"",
7-
"slug":"myapp",
7+
"slug":"|appName|",
88
"createPackageDirectory":false,
99
"type":"wheels-templates",
1010
"keywords":[
@@ -35,7 +35,7 @@
3535
},
3636
"dependencies":{
3737
"wheels":"|version|",
38-
"orgh213172lex":"lex:https://ext.lucee.org/org.h2-1.3.172.lex"
38+
"orgh213172lex":"lex:https://ext.lucee.org/org.lucee.h2-2.1.214.0001L.lex"
3939
},
4040
"private":false,
4141
"license":[

‎examples/tweet/app/snippets/ServerJSON.txt‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
{
22
"name": "|appName|",
3-
"app": {
4-
"cfengine": "|setEngine|",
5-
"serverHomeDirectory": ".wheels/server"
6-
},
73
"web": {
4+
"host":"localhost",
85
"webroot": "public",
96
"rewrites": {
107
"enable": true,
118
"config": "public/urlrewrite.xml"
129
}
10+
},
11+
"app": {
12+
"cfengine": "|setEngine|",
13+
"serverHomeDirectory": ".wheels/server",
14+
"libDirs":"app/lib"
1315
}
1416
}

‎templates/base/src/app/snippets/BoxJSON.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"author":"Wheels Core Team and Community, repackaged by Peter Amiri",
55
"shortDescription":"Wheels MVC Framework Base Template",
66
"location":"",
7-
"slug":"myapp",
7+
"slug":"|appName|",
88
"createPackageDirectory":false,
99
"type":"wheels-templates",
1010
"keywords":[
@@ -35,7 +35,7 @@
3535
},
3636
"dependencies":{
3737
"wheels":"|version|",
38-
"orgh213172lex":"lex:https://ext.lucee.org/org.h2-1.3.172.lex"
38+
"orgh213172lex":"lex:https://ext.lucee.org/org.lucee.h2-2.1.214.0001L.lex"
3939
},
4040
"private":false,
4141
"license":[

‎templates/base/src/app/snippets/ServerJSON.txt‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
{
22
"name": "|appName|",
3-
"app": {
4-
"cfengine": "|setEngine|",
5-
"serverHomeDirectory": ".wheels/server"
6-
},
73
"web": {
4+
"host":"localhost",
85
"webroot": "public",
96
"rewrites": {
107
"enable": true,
118
"config": "public/urlrewrite.xml"
129
}
10+
},
11+
"app": {
12+
"cfengine": "|setEngine|",
13+
"serverHomeDirectory": ".wheels/server",
14+
"libDirs":"app/lib"
1315
}
1416
}

0 commit comments

Comments
 (0)