Use same servletContext instance for GrailsMockHttpServletRequest and…

… the applicationContext instance
grails · Jan 22, 2014 · 872ee15 · 872ee15
1 parent 902435e
commit 872ee15
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/grails-plugin-testing/src/main/groovy/grails/test/mixin/web/ControllerUnitTestMixin.groovy b/grails-plugin-testing/src/main/groovy/grails/test/mixin/web/ControllerUnitTestMixin.groovy
@@ -268,7 +268,8 @@ class ControllerUnitTestMixin extends GrailsUnitTestMixin {
         ServletsGrailsPluginSupport.enhanceServletApi()
         ConvertersPluginSupport.enhanceApplication(grailsApplication,applicationContext)
 
-        request = new GrailsMockHttpServletRequest(requestMimeTypesApi:  new TestRequestMimeTypesApi(grailsApplication: grailsApplication, applicationContext: applicationContext))
+        request = new GrailsMockHttpServletRequest(servletContext)
+        request.requestMimeTypesApi = new TestRequestMimeTypesApi(grailsApplication: grailsApplication, applicationContext: applicationContext)
         response = new GrailsMockHttpServletResponse(responseMimeTypesApi: new TestResponseMimeTypesApi(grailsApplication: grailsApplication, applicationContext: applicationContext))
         webRequest = GrailsWebUtil.bindMockWebRequest(applicationContext, request, response)
         request = (GrailsMockHttpServletRequest)webRequest.getCurrentRequest()

diff --git a/...ain/groovy/org/codehaus/groovy/grails/plugins/testing/GrailsMockHttpServletRequest.groovy b/...ain/groovy/org/codehaus/groovy/grails/plugins/testing/GrailsMockHttpServletRequest.groovy
@@ -66,6 +66,15 @@ class GrailsMockHttpServletRequest extends MockHttpServletRequest implements Mul
     private cachedXml
     DispatcherType dispatcherType
     AsyncContext asyncContext
+
+
+    public GrailsMockHttpServletRequest() {
+        super();
+    }
+
+    public GrailsMockHttpServletRequest(ServletContext servletContext) {
+        super(servletContext);
+    }
 
     /**
      * Sets the request format to use