#239 Injector should not be set in case of testing

Igor Polevoy · Igor Polevoy · commit d6bd9b9d251d · 2015-09-22T16:20:48.000-05:00
diff --git a/activeweb/src/main/java/org/javalite/activeweb/RequestDispatcher.java b/activeweb/src/main/java/org/javalite/activeweb/RequestDispatcher.java
@@ -131,8 +131,10 @@ private void initAppConfig(String configClassName, AppContext context, boolean f
             appConfig.init(context);
             if(appConfig instanceof  Bootstrap){
                 appBootstrap = (Bootstrap) appConfig;
-                if(!Configuration.isTesting() && appBootstrap.getInjector() != null){
-                    Context.getControllerRegistry().setInjector(appBootstrap.getInjector());
+                if(!Configuration.isTesting() ){
+                    if(appBootstrap.getInjector() != null){
+                        Context.getControllerRegistry().setInjector(appBootstrap.getInjector());
+                    }
                 }
             }
             appConfig.completeInit();

Original file line number	Diff line number	Diff line change
`@@ -131,8 +131,10 @@ private void initAppConfig(String configClassName, AppContext context, boolean f`
`131`	`131`	`appConfig.init(context);`
`132`	`132`	`if(appConfig instanceof Bootstrap){`
`133`	`133`	`appBootstrap = (Bootstrap) appConfig;`
`134`		`- if(!Configuration.isTesting() && appBootstrap.getInjector() != null){`
`135`		`- Context.getControllerRegistry().setInjector(appBootstrap.getInjector());`
	`134`	`+ if(!Configuration.isTesting() ){`
	`135`	`+ if(appBootstrap.getInjector() != null){`
	`136`	`+ Context.getControllerRegistry().setInjector(appBootstrap.getInjector());`
	`137`	`+ }`
`136`	`138`	`}`
`137`	`139`	`}`
`138`	`140`	`appConfig.completeInit();`