Merge pull request Grailsrocks#1 from christoph-frick/gpc-improve-rest

Improve REST
christoph-frick · Mar 19, 2015 · 1fe811a · 1fe811a
2 parents 1940034 + 9c60dbd
commit 1fe811a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/groovy/com/grailsrocks/functionaltest/TestCaseBase.groovy b/src/groovy/com/grailsrocks/functionaltest/TestCaseBase.groovy
@@ -426,12 +426,14 @@ abstract class TestCaseBase extends GroovyTestCase implements GroovyInterceptabl
     }
 */
     JSONElement getJSON() {
-        assertContentType contentTypeForJSON
+	def contentType = stripWS(client.responseContentType.toLowerCase())
+        assertTrue "Expected content type to contain json [${contentType}]", contentType.contains("json")
         grails.converters.JSON.parse(client.responseAsString)
     }
 
     GPathResult getXML() {
-        assertContentType contentTypeForXML
+	def contentType = stripWS(client.responseContentType.toLowerCase())
+        assertTrue "Expected content type to contain xml [${contentType}]", contentType.contains("xml")
         grails.converters.XML.parse(client.responseAsString)
     }
 

diff --git a/src/groovy/com/grailsrocks/functionaltest/client/APIClient.groovy b/src/groovy/com/grailsrocks/functionaltest/client/APIClient.groovy
@@ -139,6 +139,9 @@ class APIClient implements Client {
 
                 switch (response.contentType) {
                     case ~'application/json.*':
+                    case ~'application/.*\\+json.*':
+                    case ~'application/xml.*':
+                    case ~'application/.*\\+xml.*':
                     case ~'text/.*':
                         responseString = response.data.text
                         break
@@ -150,6 +153,7 @@ class APIClient implements Client {
                         if (n) {
                             responseString += "\r\n and $n more bytes"
                         }
+			response.data.reset()
                         break
                 }
             } else {