Merge branch '2.1.x' into 2.2.x

Author: graemerocher

grails-plugin-testing/src/main/groovy/grails/test/mixin/web/GroovyPageUnitTestMixin.groovy

@@ -23,6 +23,7 @@ import org.codehaus.groovy.grails.commons.GrailsTagLibClass
 import org.codehaus.groovy.grails.commons.TagLibArtefactHandler
 import org.codehaus.groovy.grails.commons.metaclass.MetaClassEnhancer
 import org.codehaus.groovy.grails.plugins.web.api.TagLibraryApi
+import org.codehaus.groovy.grails.web.pages.GroovyPageRequestBinding
 import org.codehaus.groovy.grails.web.pages.GroovyPagesTemplateEngine
 import org.codehaus.groovy.grails.web.pages.TagLibraryLookup
 import org.codehaus.groovy.grails.web.plugins.support.WebMetaUtils;
@@ -60,7 +61,7 @@ class GroovyPageUnitTestMixin extends ControllerUnitTestMixin {
     @Before
     void bindGrailsWebRequest() {
         super.bindGrailsWebRequest()
-        pageScope = new GroovyPageBinding()
+        pageScope = new GroovyPageBinding(new GroovyPageRequestBinding(webRequest))
         request.setAttribute(GrailsApplicationAttributes.PAGE_SCOPE, pageScope)
 
     }

grails-plugin-testing/src/main/groovy/org/codehaus/groovy/grails/compiler/injection/test/TestForTransformation.java

@@ -113,6 +113,7 @@ public class TestForTransformation extends TestMixinTransformation {
 
     public static final AnnotationNode TEST_ANNOTATION = new AnnotationNode(new ClassNode(Test.class));
     public static final ClassNode GROOVY_TEST_CASE_CLASS = new ClassNode(GroovyTestCase.class);
+    public static final String VOID_TYPE = "void";
 
     private ResourceLocator resourceLocator;
 
@@ -236,7 +237,9 @@ public void testFor(ClassNode classNode, ClassExpression ce) {
                 List<AnnotationNode> existingTestAnnotations = methodNode.getAnnotations(testAnnotationClassNode);
                 if (isCandidateMethod(methodNode) && (methodNode.getName().startsWith("test") || existingTestAnnotations.size()>0)) {
                     if (existingTestAnnotations.size()==0) {
-                        methodNode.addAnnotation(TEST_ANNOTATION);
+                        ClassNode returnType = methodNode.getReturnType();
+                        if(returnType.getName().equals(VOID_TYPE))
+                            methodNode.addAnnotation(TEST_ANNOTATION);
                     }
                     hasTestMethods = true;
                 }

grails-test-suite-uber/src/test/groovy/grails/test/mixin/ControllerAndGroovyPageMixinTests.groovy

@@ -0,0 +1,25 @@
+package grails.test.mixin
+
+import grails.test.mixin.web.GroovyPageUnitTestMixin
+import org.junit.Test
+
+/**
+ * @author Graeme Rocher
+ */
+@TestMixin(GroovyPageUnitTestMixin)
+@TestFor(MyController)
+class ControllerAndGroovyPageMixinTests {
+
+    // GRAILS-9718
+    @Test
+    void testController() {
+        controller != null
+
+        views['/foo/_bar.gsp'] = 'Id: ${params.id}'
+
+        params.id = 10
+        def content = render(template:"/foo/bar")
+
+        assert content == 'Id: 10'
+    }
+}