Merge branch '2.5.x' into 3.0.x

Conflicts: grails-plugin-rest/src/main/groovy/grails/artefact/controller/RestResponder.groovy grails-test-suite-web/src/test/groovy/grails/rest/web/RespondMethodSpec.groovy
fernando88to · Apr 7, 2015 · 66c8c7b · 66c8c7b
2 parents 3ec13ea + d5d3a8a
commit 66c8c7b
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/grails-test-suite-web/src/test/groovy/grails/rest/web/RespondMethodSpec.groovy b/grails-test-suite-web/src/test/groovy/grails/rest/web/RespondMethodSpec.groovy
@@ -231,7 +231,7 @@ class RespondMethodSpec extends Specification{
         modelAndView.viewName == 'showWithModel'
     }
 
-    @Issue('grails/grails-core#610')
+    @Issue(['grails/grails-core#610', 'grails/grails-core#611'])
     void 'Test respond with a single Map argument'() {
         when:
         response.format = 'json'
@@ -241,14 +241,15 @@ class RespondMethodSpec extends Specification{
         response.json.name == 'Jeff'
     }
 
-    @Issue('grails/grails-core#610')
+    @Issue(['grails/grails-core#610', 'grails/grails-core#611'])
     void 'Test respond with a Map argument and named arguments'() {
         when:
         response.format = 'json'
         controller.respondWithMapAndNamedArguments()
 
         then:
         response.json.name == 'Jeff'
+        response.status == 201
     }
 }
 
@@ -275,7 +276,7 @@ class BookController {
     }
 
     def respondWithMapAndNamedArguments() {
-        respond([name: 'Jeff'], status: 200)
+        respond([name: 'Jeff'], status: 201)
     }
 }
 @Entity