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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,8 @@ All historical references to "CFWheels" in this changelog have been preserved fo

### Fixed

- Framework-internal browser-test fixture controllers, views, and the `/_browser/*` routes no longer leak into application-level files. Moved from `app/controllers/BrowserTest*.cfc`, `app/views/browsertest*/`, and `config/routes.cfm` into `vendor/wheels/public/browser-fixtures/`, auto-mounted by `$lockedLoadRoutes` when environment is `testing` or `development` and the new opt-in setting `loadBrowserTestFixtures=true` is set. Apps upgrading from a 4.0 snapshot that had custom `/_browser/*` routes must opt in explicitly or re-declare them in `config/routes.cfm`. (#2135, #2138)
- Stray `app/mailers/UserNotificationsMailer.cfc` demo removed from the framework repo root (byte-identical copies remain in the example apps under `examples/tweet/` and `examples/starter-app/`). (#2138)
- View lookup after `renderText()` / `renderWith()` no longer breaks subsequent partial rendering (#1991)
- Scaffolded apps from `wheels new` now boot correctly (#2096)
- `wheels stats` crash on Lucee 7 — private `sprintf()` helper called `Left(result, 0)` when the format string started with a placeholder. Lucee 7 throws where Lucee 6 returned empty silently. Added a ternary guard per the project's cross-engine compatibility pattern.
Expand Down
19 changes: 0 additions & 19 deletions app/controllers/BrowserTestHome.cfc

This file was deleted.

17 changes: 0 additions & 17 deletions app/controllers/BrowserTestLogin.cfc

This file was deleted.

22 changes: 0 additions & 22 deletions app/controllers/BrowserTestSessions.cfc

This file was deleted.

39 changes: 0 additions & 39 deletions app/mailers/UserNotificationsMailer.cfc

This file was deleted.

8 changes: 0 additions & 8 deletions app/views/browsertesthome/dashboard.cfm

This file was deleted.

5 changes: 0 additions & 5 deletions app/views/browsertesthome/index.cfm

This file was deleted.

12 changes: 0 additions & 12 deletions app/views/browsertesthome/layout.cfm

This file was deleted.

4 changes: 0 additions & 4 deletions app/views/browsertestlogin/create.cfm

This file was deleted.

12 changes: 0 additions & 12 deletions app/views/browsertestlogin/layout.cfm

This file was deleted.

12 changes: 0 additions & 12 deletions app/views/browsertestsessions/layout.cfm

This file was deleted.

14 changes: 0 additions & 14 deletions app/views/browsertestsessions/new.cfm

This file was deleted.

20 changes: 0 additions & 20 deletions app/views/usernotificationsmailer/sendEmail.cfm

This file was deleted.

37 changes: 12 additions & 25 deletions config/routes.cfm
Original file line number Diff line number Diff line change
@@ -1,28 +1,15 @@
<cfscript>

// Use this file to add routes to your application and point the root route to a controller action.
// Don't forget to issue a reload request (e.g. reload=true) after making changes.
// See https://wheels.dev/3.1.0/guides/handling-requests-with-controllers/routing for more info.

mapper()
// CLI-Appends-Here

// Browser test fixture routes (loginAs endpoint is env-gated in controller)
.scope(path="/_browser")
.get(name="browserTestHome", pattern="/home", to="BrowserTestHome##index")
.get(name="browserTestLogin", pattern="/login", to="BrowserTestSessions##new")
.post(name="browserTestAuthenticate", pattern="/login", to="BrowserTestSessions##create")
.get(name="browserTestDashboard", pattern="/dashboard", to="BrowserTestHome##dashboard")
.post(name="browserTestLogout", pattern="/logout", to="BrowserTestSessions##destroy")
.get(name="browserTestLoginAs", pattern="/login-as", to="BrowserTestLogin##create")
.end()

// The "wildcard" call below enables automatic mapping of "controller/action" type routes.
// This way you don't need to explicitly add a route every time you create a new action in a controller.
.wildcard()

// The root route below is the one that will be called on your application's home page (e.g. http://127.0.0.1/).
//.root(to = "home##index", method = "get")
.root(method = "get")
// Use this file to add routes to your application and point the root route to a controller action.
// Don't forget to issue a reload request (e.g. reload=true) after making changes.
// See https://wheels.dev/3.1.0/guides/handling-requests-with-controllers/routing for more info.

mapper()
// CLI-Appends-Here
// The "wildcard" call below enables automatic mapping of "controller/action" type routes.
// This way you don't need to explicitly add a route every time you create a new action in a controller.
.wildcard()
// The root route below is the one that will be called on your application's home page (e.g. http://127.0.0.1/).
// .root(to = "home##index", method = "get")
.root(method = "get")
.end();
</cfscript>
26 changes: 15 additions & 11 deletions config/settings.cfm
Original file line number Diff line number Diff line change
@@ -1,32 +1,36 @@
<cfscript>
/*
/*
Use this file to configure your application.
You can also use the environment specific files (e.g. /config/production/settings.cfm) to override settings set here.
Don't forget to issue a reload request (e.g. reload=true) after making changes.
See https://wheels.dev/3.1.0/guides/working-with-wheels/configuration-and-defaults for more info.
*/

/*
/*
You can change the "wheels.dev" value from the two functions below to set your datasource.
You can change the the value for the "dataSourceName" to set a default datasource to be used throughout your application.
You can also change the value for the "coreTestDataSourceName" to set your testing datasource.
You can also uncomment the 2 "set" functions below them to set the username and password for the datasource.
*/
set(coreTestDataSourceName="wheels-dev");
set(dataSourceName="wheels-dev");
// set(dataSourceUserName="");
// set(dataSourcePassword="");
set(coreTestDataSourceName = "wheels-dev");
set(dataSourceName = "wheels-dev");
// set(dataSourceUserName="");
// set(dataSourcePassword="");

/*
/*
If you comment out the following line, Wheels will try to determine the URL rewrite capabilities automatically.
The "URLRewriting" setting can bet set to "on", "partial" or "off".
To run with "partial" rewriting, the "cgi.path_info" variable needs to be supported by the web server.
To run with rewriting set to "on", you need to apply the necessary rewrite rules on the web server first.
*/
set(URLRewriting="On");
set(URLRewriting = "On");

// Reload your application with ?reload=true&password=wheels.dev
set(reloadPassword="wheels-dev");
// Reload your application with ?reload=true&password=wheels.dev
set(reloadPassword = "wheels-dev");

// CLI-Appends-Here
// Opt in to the framework's browser-test fixture routes (`/_browser/*`).
// Only mounted when environment is `testing` or `development`. See issues #2135, #2138.
set(loadBrowserTestFixtures = true);

// CLI-Appends-Here
</cfscript>
Loading
Loading