Merge pull request #1 from jfaissolle/master

Spock integration tests support

GuardGrailsPlugin.groovy

@@ -8,6 +8,8 @@ class GuardGrailsPlugin {
     // the other plugins this plugin depends on
     def dependsOn = [:]
 
+    def loadAfter = ['spock']
+
     // resources that are excluded from plugin packaging
     def pluginExcludes = [
         "grails-app/views/error.gsp"

grails-app/conf/BuildConfig.groovy

@@ -21,5 +21,8 @@ grails.project.dependency.resolution = {
         build(":tomcat:$grailsVersion", ":release:2.0.3") {
             export = false
         }
+        test(":spock:0.6") {
+            export = false
+        }
     }
 }

scripts/_Events.groovy

@@ -2,11 +2,20 @@ import org.codehaus.groovy.grails.test.junit4.JUnit4GrailsTestType
 import org.codehaus.groovy.grails.test.support.GrailsTestMode
 
 guardTests = []
+guardSpock = false
+
 
 loadGuardTestTypes = {
     phasesToRun << "guard"
     def mode = new GrailsTestMode(autowire: true, wrapInTransaction: true, wrapInRequestEnvironment: true)
     guardTests << new JUnit4GrailsTestType("guard", "integration", mode)
+
+    // if spock is loaded
+    if (binding.variables.containsKey("loadSpecTestTypeClass")) {
+        def specTestTypeClass = loadSpecTestTypeClass()
+        guardSpock = true
+        guardTests << specTestTypeClass.newInstance('spock', 'integration')
+    }
 }
 
 // Guard testing uses the same startup as integration

scripts/_Guard.groovy

@@ -17,7 +17,7 @@ target(watchForTestChanges: "Watch for changes") {
         grailsConsole.addStatus "--------------------------------------------------------------------"
 
         GuardFileChangeListener listener = registerReloadingListener()
-        watchLoop(listener)
+        watchLoop(listener, guardSpock)
     }
     else {
         grailsConsole.error "Reloading agent not enabled, try running grails with the -reloading flag as the first argument"
@@ -44,7 +44,7 @@ GuardFileChangeListener registerReloadingListener() {
 /**
  * Main watch loop
  */
-def watchLoop(GuardFileChangeListener listener) {
+def watchLoop(GuardFileChangeListener listener, spock) {
     //noinspection GroovyInfiniteLoopStatement
     while(true) {
         def changes = listener.consumeChanges()
@@ -73,9 +73,18 @@ def watchLoop(GuardFileChangeListener listener) {
             def mode = new GrailsTestMode(autowire: true, wrapInTransaction: true, wrapInRequestEnvironment: true)
             def guardTestType = new JUnit4GrailsTestType("guard", "integration", mode)
 
+
             // Run the tests
             currentTestPhaseName = "guard"
             processTests(guardTestType)
+
+            // Run Spock tests
+            if (spock) {
+                def specTestTypeClass = classLoader.loadClass('grails.plugin.spock.test.GrailsSpecTestType')
+                def specTestType = specTestTypeClass.newInstance('spock', "integration")
+                processTests(specTestType)
+            }
+
             currentTestPhaseName = null
 
             grailsConsole.addStatus "Tests Complete"

test/integration/guard/grails/SampleServiceSpec.groovy

@@ -0,0 +1,17 @@
+package guard.grails
+import grails.plugin.spock.IntegrationSpec
+
+import spock.lang.*
+
+class SampleServiceSpec extends IntegrationSpec {
+
+	def sampleService
+
+	def "injected sampleService is present"() {
+	    when:
+	    	def msg = sampleService.helloWorld()
+
+	    then:
+	    	msg == "Hello World!"
+  }
+}