Merge branch '2.1.x' into 2.2.x

Author: graemerocher

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

@@ -170,13 +170,15 @@ public void visit(ASTNode[] astNodes, SourceUnit source) {
                 String fileName = source.getName();
                 String className = GrailsResourceUtils.getClassName(new org.codehaus.groovy.grails.io.support.FileSystemResource(fileName));
                 if (className != null) {
-                    boolean isSpock = className.endsWith("Spec");
                     String targetClassName = null;
 
-                    if (isJunit) {
+                    if (className.endsWith("Tests")) {
                         targetClassName = className.substring(0, className.indexOf("Tests"));
                     }
-                    else if (isSpock) {
+                    else if (className.endsWith("Test")) {
+                        targetClassName = className.substring(0, className.indexOf("Test"));
+                    }
+                    else if (className.endsWith("Spec")) {
                         targetClassName = className.substring(0, className.indexOf("Spec"));
                     }