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
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ jobs:
runs-on: ubuntu-24.04
services:
s3Mock:
image: adobe/s3mock
image: adobe/s3mock:4.12.2
ports:
- 9090:9090
env:
initialBuckets: cbfs-test
COM_ADOBE_TESTING_S3MOCK_STORE_INITIAL_BUCKETS: cbfs-test
env:
DB_USER: root
DB_PASSWORD: root
Expand Down
2 changes: 1 addition & 1 deletion models/providers/RamProvider.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -890,7 +890,7 @@ component accessors="true" extends="cbfs.models.AbstractDiskProvider" {
} else {
this.files( arguments.directory )
.each( ( file ) => {
this.delete( arguments.file )
this.delete( arguments.file );
} );
intercept.announce( "cbfsOnDirectoryDelete", { "directory" : arguments.directory, "disk" : this } );
return !this.directoryExists( arguments.directory );
Expand Down
5 changes: 5 additions & 0 deletions test-harness/config/Coldbox.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,11 @@

/**
* Load the Module you are testing
*
* Note: We can't rely on `request.MODULE_NAME` here because ColdBox's test harness
* clears/bypasses the `request` scope between virtual-app reinits (BaseTestCase's
* reset()/beforeTests()), so that key set in Application.cfc's pseudo-constructor
* may no longer exist by the time this interceptor fires on a reinit.
*/
function cbLoadInterceptorHelpers( event, interceptData, rc, prc ){
controller
Expand Down
Loading