Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions cli/src/commands/wheels/test.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -89,14 +89,12 @@ component extends="base" {
// Always force JSON as return format
if(loc.type eq 'app'){
loc.testurl = "http://" & loc.host & ":" & loc.port
& "/" & "?controller=tests&action=runner&view=runner"
& "&type=#loc.type#"
& "/" & "?controller=wheels.public&action=testbox&view=runner"
& "&format=#loc.format#"
& "&reload=#loc.reload#";
} else if(loc.type eq 'core'){
loc.testurl = "http://" & loc.host & ":" & loc.port
& "/" & "?controller=wheels.tests_testbox&action=runner&view=runner"
& "&type=#loc.type#"
& "/" & "?controller=wheels.public&action=tests_testbox&view=runner"
& "&format=#loc.format#"
& "&reload=#loc.reload#";
} else {
Expand Down
4 changes: 4 additions & 0 deletions core/src/wheels/Public.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ component output="false" displayName="Internal GUI" extends="wheels.Global" {
include "/wheels/public/views/runner.cfm";
return "";
}

function testbox(){
include "/tests/Testbox/runner.cfm";
}

public function tests_testbox(){
// Set proper HTTP status first
Expand Down
2 changes: 1 addition & 1 deletion core/src/wheels/events/onrequestend/debug.cfm
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
<a href="#urlFor(route = "wheelsGuides")#" class="btn" target="_blank">Guides</a>
</td>
<td>
<a href="#urlFor(route = "wheelsPackages", type = "app")#" class="btn" target="_blank">Tests</a>
<a href="#urlFor(route = "wheelstestbox")#" class="btn" target="_blank">Tests</a>
</td>
<cfif $get("enableMigratorComponent")>
<td>
Expand Down
2 changes: 1 addition & 1 deletion core/src/wheels/public/layout/_navigation.cfm
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
navArgs['type'] = item['type'];
</cfscript>
<cfif item.title eq "Tests">
<a href="/wheels/testbox" class="#navArgs['class']#">#navArgs.Text#</a>
<a href="#urlFor(route = "testbox")#" class="#navArgs['class']#">#navArgs.Text#</a>
<cfelse>
<a href="#urlFor(argumentCollection = navArgs)#" class="#navArgs['class']#">#navArgs.Text#</a>
</cfif>
Expand Down
2 changes: 1 addition & 1 deletion core/src/wheels/public/routes.cfm
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ mapper()
.end()
// Add route for tests controller outside the wheels namespace
.get(name = "testsController", pattern = "tests", to = "tests##index")
.get(name = "testbox", pattern = "testbox", to = "tests##runner")
.get(name = "testbox", pattern = "testbox", to = "wheels##public##testbox")
.end();
</cfscript>
1 change: 0 additions & 1 deletion templates/base/src/app/views/tests/runner.cfm

This file was deleted.