GRAILS-7022 small backwards compatibility 'fix'

Author: burtbeckwith

src/java/grails/test/MockUtils.groovy

@@ -203,6 +203,7 @@ class MockUtils {
 
                 modelAndView.viewName =  map["view"]
                 modelAndView.addAllObjects(map["model"])
+                return map["model"] // backwards compatibility for GRAILS-7022 - shouldn't ordinarily be referenced, use renderArgs instead
             }
             else if (map["text"] != null) {
                 delegate.response.outputStream << map["text"]

src/test/grails/test/MockUtilsTests.groovy

@@ -758,6 +758,18 @@ class MockUtilsTests extends GroovyTestCase {
         assertEquals(101, controller.modelAndView.model.count)
     }
 
+    /**
+     * Test for GRAILS-7022
+     */
+    void testGRAILS7022() {
+        MockUtils.mockController(TestController)
+
+        def controller = new TestController()
+
+        def returnValue = controller.render(view: "list", model: [count: 101])
+        assertTrue returnValue instanceof Map
+    }
+
     /**
      * Tests that the render method used for templates populates the
      * "renderArgs" map with the given values.