Skip to content

Commit e125e35

Browse files
committed
revert context setup changes due to other engine failures
1 parent b1d50f0 commit e125e35

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

system/testing/BaseInterceptorTest.cfc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@ component extends="coldbox.system.testing.BaseTestCase" {
1616
var mockBox = getMockBox();
1717
var applicationHelper = [];
1818

19-
super.setup();
19+
// Load ColdBox?
20+
if ( this.loadColdBox ) {
21+
super.setup();
22+
}
2023

2124
// Check for interceptor else throw exception
2225
if ( NOT structKeyExists( md, "interceptor" ) ) {

system/testing/BaseModelTest.cfc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@ component extends="coldbox.system.testing.BaseTestCase" {
1515
var md = getMetadata( this );
1616
var mockBox = getMockBox();
1717

18-
super.setup();
18+
// Load ColdBox?
19+
if ( this.loadColdBox ) {
20+
super.setup();
21+
}
1922

2023
// Check for model path annotation, and use it if declared.
2124
if ( structKeyExists( md, "model" ) ) {

system/testing/BaseTestCase.cfc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,6 @@ component extends="testbox.system.compat.framework.TestCase" accessors="true" {
144144

145145
structDelete( request, "_lastInvalidEvent" );
146146
}
147-
148-
// make sure all references to the request context are using the MockContext
149-
getRequestContext();
150147
}
151148

152149
/**

0 commit comments

Comments
 (0)