Skip to content

Commit 41ecb57

Browse files
committed
compat updates to avoid wirebox collissions
1 parent a300ebb commit 41ecb57

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

test-harness/tests/specs/unit/SecurityTest.cfc

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ component extends="coldbox.system.testing.BaseInterceptorTest" interceptor="cbse
1212
beforeEach( function( currentSpec ){
1313
// setup properties
1414
setup();
15-
variables.wirebox = new coldbox.system.ioc.Injector();
1615
mockController
1716
.$( "getAppHash", hash( "appHash" ) )
1817
.$( "getAppRootPath", expandPath( "/root" ) )
@@ -107,7 +106,7 @@ component extends="coldbox.system.testing.BaseInterceptorTest" interceptor="cbse
107106
security
108107
.$( "getInstance" )
109108
.$args( settings.firewall.validator )
110-
.$results( wirebox.getInstance( settings.firewall.validator ) );
109+
.$results( mockWireBox.getInstance( settings.firewall.validator ) );
111110

112111
security.afterAspectsLoad();
113112

@@ -141,7 +140,7 @@ component extends="coldbox.system.testing.BaseInterceptorTest" interceptor="cbse
141140
security
142141
.$( "getInstance" )
143142
.$args( settings.firewall.validator )
144-
.$results( wirebox.getInstance( settings.firewall.validator ) );
143+
.$results( mockWireBox.getInstance( settings.firewall.validator ) );
145144
security.configure();
146145
expect( security.$getProperty( "enableInvalidHandlerCheck" ) ).toBeFalse();
147146
} );
@@ -155,7 +154,7 @@ component extends="coldbox.system.testing.BaseInterceptorTest" interceptor="cbse
155154
security
156155
.$( "getInstance" )
157156
.$args( settings.firewall.validator )
158-
.$results( wirebox.getInstance( settings.firewall.validator ) );
157+
.$results( mockWireBox.getInstance( settings.firewall.validator ) );
159158
security.configure();
160159
expect( security.$getProperty( "enableInvalidHandlerCheck" ) ).toBeTrue();
161160
} );
@@ -166,7 +165,7 @@ component extends="coldbox.system.testing.BaseInterceptorTest" interceptor="cbse
166165
security
167166
.$( "getInstance" )
168167
.$args( settings.firewall.validator )
169-
.$results( wirebox.getInstance( settings.firewall.validator ) );
168+
.$results( mockWireBox.getInstance( settings.firewall.validator ) );
170169
} );
171170

172171
it( "can load JSON Rules", function(){
@@ -217,7 +216,7 @@ component extends="coldbox.system.testing.BaseInterceptorTest" interceptor="cbse
217216
)
218217
.$( "getInstance" )
219218
.$args( settings.firewall.validator )
220-
.$results( wirebox.getInstance( settings.firewall.validator ) );
219+
.$results( mockWireBox.getInstance( settings.firewall.validator ) );
221220
} );
222221

223222
it( "can load JSON Rules based on module settings", function(){
@@ -275,7 +274,7 @@ component extends="coldbox.system.testing.BaseInterceptorTest" interceptor="cbse
275274
return createMock( "cbsecurity.models.util.RulesLoader" )
276275
.init()
277276
.setController( variables.mockController )
278-
.setWireBox( variables.wirebox );
277+
.setWireBox( variables.mockWireBox );
279278
}
280279

281280
}

0 commit comments

Comments
 (0)