fix RequestAndResponseMimeTypesApiSpec after fixing state handling

mfatihercik · Jan 7, 2015 · 51ceaa7 · 51ceaa7
1 parent a525901
commit 51ceaa7
Showing 1 changed file with 9 additions and 10 deletions.
diff --git a/...oovy/org/codehaus/groovy/grails/plugins/web/api/RequestAndResponseMimeTypesApiSpec.groovy b/...oovy/org/codehaus/groovy/grails/plugins/web/api/RequestAndResponseMimeTypesApiSpec.groovy
@@ -1,32 +1,34 @@
 package org.codehaus.groovy.grails.plugins.web.api
-
 import grails.config.Config
 import grails.core.DefaultGrailsApplication
 import grails.core.GrailsApplication
 import grails.util.GrailsWebMockUtil
 import grails.web.mime.MimeType
 import org.grails.config.PropertySourcesConfig
 import org.grails.core.lifecycle.ShutdownOperations
-import org.grails.web.mime.HttpServletResponseExtension
+import org.grails.plugins.web.mime.MimeTypesFactoryBean
 import org.grails.web.servlet.mvc.GrailsWebRequest
 import org.springframework.core.env.MapPropertySource
 import org.springframework.core.env.MutablePropertySources
+import org.springframework.mock.web.MockHttpServletRequest
 import org.springframework.mock.web.MockServletContext
 import org.springframework.web.context.WebApplicationContext
 import org.springframework.web.context.support.GenericWebApplicationContext
-import org.grails.plugins.web.mime.MimeTypesFactoryBean
-import org.springframework.mock.web.MockHttpServletRequest
 import spock.lang.Issue
 import spock.lang.Specification
 import spock.lang.Unroll
-
 /**
  * Tests for mime type resolution
  */
 class RequestAndResponseMimeTypesApiSpec extends Specification{
     def responseMimeTypesApiInstance
     def application
-
+
+    void setupSpec() {
+        // ensure clean state
+        ShutdownOperations.runOperations()
+    }
+
     void setup() {
         application = new DefaultGrailsApplication()
         application.config = testConfig
@@ -215,10 +217,7 @@ class RequestAndResponseMimeTypesApiSpec extends Specification{
             }
             application.setConfig(config)
             println "$userAgent - $additionalConfig - ${application.flatConfig.get('grails.mime.disable.accept.header.userAgents')}"
-            HttpServletResponseExtension.loadMimeTypeConfig(config)
-//            responseMimeTypesApiInstance.loadMimeTypeConfig()
-//            println "disableForUserAgents: ${responseMimeTypesApiInstance.disableForUserAgents}"
-            final webRequest = GrailsWebMockUtil.bindMockWebRequest()
+            final webRequest = boundMimeTypeRequest()
             def request = webRequest.currentRequest
             def response = webRequest.currentResponse
             request.addHeader('Accept', acceptHeader)