Switching to 4.0.1-SNAPSHOT of the geb plugin for testing

.github/workflows/gradle.yml

@@ -40,7 +40,7 @@ jobs:
         id: tests
         uses: gradle/gradle-build-action@v2
         with:
-          arguments: check -Dgeb.env=chromeHeadless
+          arguments: check
         env:
           GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
           GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
@@ -53,7 +53,7 @@ jobs:
           GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
           GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
         with:
-          arguments: build -Dgeb.env=chromeHeadless
+          arguments: build
       - name: Publish Test Report
         if: steps.build.outcome == 'failure' || steps.tests.outcome == 'failure'
         uses: scacap/action-surefire-report@v1

README.md

@@ -5,6 +5,3 @@
 
 A Suite of functional tests for Grails
 
-To change the Geb driver used to run the functional tests supply the geb.env system property.
-
-    ./gradlew -Dgeb.env=chromeHeadless iT   

app1/build.gradle

@@ -5,18 +5,20 @@ buildscript {
     dependencies {
         classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion"
         classpath "com.bertramlabs.plugins:asset-pipeline-gradle:$assetPipelineVersion"
-        classpath "gradle.plugin.com.energizedwork.webdriver-binaries:webdriver-binaries-gradle-plugin:$webdriverBinariesVersion"
     }
 }
 
+plugins {
+    id 'com.github.ben-manes.versions' version '0.39.0'
+}
+
 version "0.1"
 group "functionaltests"
 
 apply plugin: "war"
 apply plugin: "asset-pipeline"
 apply plugin: "org.grails.grails-web"
 apply plugin: "org.grails.grails-gsp"
-apply plugin:"com.energizedwork.webdriver-binaries"
 
 assets {
     minifyJs = true

app1/src/integration-test/groovy/functionaltests/AsyncFunctionalSpec.groovy

@@ -1,6 +1,7 @@
 package functionaltests
 
 import grails.gorm.transactions.Rollback
+import grails.plugin.geb.ContainerGebSpec
 import grails.testing.mixin.integration.Integration
 
 /*
@@ -19,16 +20,12 @@ import grails.testing.mixin.integration.Integration
  * limitations under the License.
  */
 
-
-
-import geb.spock.*
-
 /**
  * @author graemerocher
  */
 @Integration(applicationClass = Application)
 @Rollback
-class AsyncFunctionalSpec extends GebSpec {
+class AsyncFunctionalSpec extends ContainerGebSpec {
 
     void "Test async response rendering works"() {
         when:"When an async response is rendered"

app1/src/integration-test/groovy/functionaltests/BookFunctionalSpec.groovy

@@ -1,11 +1,11 @@
 package functionaltests
 
 import grails.testing.mixin.integration.Integration
-import geb.spock.GebSpec
+import grails.plugin.geb.ContainerGebSpec
 import spock.lang.Issue
 
 @Integration(applicationClass=functionaltests.Application)
-class BookFunctionalSpec extends GebSpec {
+class BookFunctionalSpec extends ContainerGebSpec {
 
     void "Test that when the /viewBooks URL is hit it redirects to the book list"() {
         when:"We go to the book URI"

app1/src/integration-test/groovy/functionaltests/ConfigTestControllerSpec.groovy

@@ -1,12 +1,12 @@
 package functionaltests
 
-import geb.spock.GebSpec
+import grails.plugin.geb.ContainerGebSpec
 import grails.gorm.transactions.Rollback
 import grails.testing.mixin.integration.Integration
 
 @Integration(applicationClass = Application)
 @Rollback
-class ConfigTestControllerSpec extends GebSpec {
+class ConfigTestControllerSpec extends ContainerGebSpec {
 
     void "Test that configuration properties are correctly read"() {
         when:"When evaluting configuration values"

app1/src/integration-test/groovy/functionaltests/ControllerFromPluginSpec.groovy

@@ -1,11 +1,10 @@
 package functionaltests
 
 import grails.testing.mixin.integration.Integration
-import spock.lang.*
-import geb.spock.*
+import grails.plugin.geb.ContainerGebSpec
 
 @Integration(applicationClass = Application)
-class ControllerFromPluginSpec extends GebSpec {
+class ControllerFromPluginSpec extends ContainerGebSpec {
 
     void 'test invoking a controller provided by a plugin'() {
         when:

app1/src/integration-test/groovy/functionaltests/ControllerIncludesSpec.groovy

@@ -19,17 +19,14 @@ import grails.testing.mixin.integration.Integration
  * limitations under the License.
  */
 
-
-
-import spock.lang.*
-import geb.spock.*
+import grails.plugin.geb.ContainerGebSpec
 
 /**
  * @author graemerocher
  */
 @Integration(applicationClass = Application)
 @Rollback
-class ControllerIncludesSpec extends GebSpec {
+class ControllerIncludesSpec extends ContainerGebSpec {
 
     void "Test includes that render a view work when called from a controller action"() {
         when:"When an include that renders a view is used inside a controller action"

app1/src/integration-test/groovy/functionaltests/ErrorsFunctionalSpec.groovy

@@ -4,13 +4,13 @@ import grails.gorm.transactions.Rollback
 import grails.testing.mixin.integration.Integration
 
 import spock.lang.*
-import geb.spock.*
+import grails.plugin.geb.ContainerGebSpec
 
 /**
  */
 @Integration(applicationClass = Application)
 @Rollback
-class ErrorsFunctionalSpec extends GebSpec {
+class ErrorsFunctionalSpec extends ContainerGebSpec {
 
     void "Test exception handling methods for internal controller exceptions"() {
         when:"An action that throws a custom error that is handled by a 500 mapping in UrlMappings.groovy"

app1/src/integration-test/groovy/functionaltests/ForwardingSpec.groovy

@@ -4,13 +4,13 @@ import grails.gorm.transactions.Rollback
 import grails.testing.mixin.integration.Integration
 
 import spock.lang.*
-import geb.spock.*
+import grails.plugin.geb.ContainerGebSpec
 
 /**
  */
 @Integration(applicationClass = Application)
 @Rollback
-class ForwardingSpec extends GebSpec {
+class ForwardingSpec extends ContainerGebSpec {
 
     void "Test forward to same controller"() {
         when:"A forward is issued to an action in the same controller"

app1/src/integration-test/groovy/functionaltests/HomeSpec.groovy

@@ -1,10 +1,10 @@
 package functionaltests
 
-import geb.spock.*
+import grails.plugin.geb.ContainerGebSpec
 import grails.testing.mixin.integration.Integration
 
 @Integration(applicationClass = Application)
-class HomeSpec extends GebSpec {
+class HomeSpec extends ContainerGebSpec {
 
     void "Test the home page renders correctly"() {
         when:"The home page is visited"

app1/src/integration-test/groovy/functionaltests/I18nSpec.groovy

@@ -1,14 +1,14 @@
 package functionaltests
 
-import geb.spock.*
+import grails.plugin.geb.ContainerGebSpec
 import grails.testing.mixin.integration.Integration
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.*
 
 /**
  */
 @Integration(applicationClass = Application)
-class i18nSpec extends GebSpec {
+class i18nSpec extends ContainerGebSpec {
 
     @Autowired
     MessageSource messageSource

app1/src/integration-test/groovy/functionaltests/InspectConfigControllerSpec.groovy

@@ -2,10 +2,10 @@ package functionaltests
 
 import grails.testing.mixin.integration.Integration
 import spock.lang.Issue
-import geb.spock.GebSpec
+import grails.plugin.geb.ContainerGebSpec
 
 @Integration(applicationClass = Application)
-class InspectConfigControllerSpec extends GebSpec {
+class InspectConfigControllerSpec extends ContainerGebSpec {
 
     @Issue('GRAILS-11951')
     void "test config properties from plugins"() {

app1/src/integration-test/groovy/functionaltests/InterceptorDependencyInjectionSpec.groovy

@@ -2,13 +2,13 @@ package functionaltests
 
 import grails.testing.mixin.integration.Integration
 import spock.lang.*
-import geb.spock.*
+import grails.plugin.geb.ContainerGebSpec
 
 /**
  * @author graemerocher
  */
 @Integration(applicationClass = Application)
-class InterceptorDependencyInjectionSpec extends GebSpec {
+class InterceptorDependencyInjectionSpec extends ContainerGebSpec {
 
     void "Test that interceptors are subjected to autowire by name"() {
         when:

app1/src/integration-test/groovy/functionaltests/InterceptorFunctionalSpec.groovy

@@ -1,11 +1,11 @@
 package functionaltests
 
-import geb.spock.GebSpec
+import grails.plugin.geb.ContainerGebSpec
 import grails.testing.mixin.integration.Integration
 import spock.lang.Issue
 
 @Integration(applicationClass = Application)
-class InterceptorFunctionalSpec extends GebSpec {
+class InterceptorFunctionalSpec extends ContainerGebSpec {
 
     @Issue('grails/grails-core#9434')
     void "Test that an interceptor exception is handled correctly"() {

app1/src/integration-test/groovy/functionaltests/LoadAfterSpec.groovy

@@ -1,10 +1,10 @@
 package functionaltests
 
-import geb.spock.GebSpec
+import grails.plugin.geb.ContainerGebSpec
 import grails.testing.mixin.integration.Integration
 
 @Integration
-class LoadAfterSpec extends GebSpec {
+class LoadAfterSpec extends ContainerGebSpec {
 
     void "Test override one plugin view from another plugin"() {
         when:

app1/src/integration-test/groovy/functionaltests/MiscFunctionalSpec.groovy

@@ -2,10 +2,10 @@ package functionaltests
 
 import grails.testing.mixin.integration.Integration
 import spock.lang.*
-import geb.spock.*
+import grails.plugin.geb.ContainerGebSpec
 
 @Integration(applicationClass = Application)
-class MiscFunctionalSpec extends GebSpec {
+class MiscFunctionalSpec extends ContainerGebSpec {
 
     @Issue('9133')
     void "Test that bean override configuration works"() {

app1/src/integration-test/groovy/functionaltests/PluginViewsControllerSpec.groovy

@@ -4,13 +4,13 @@ import grails.gorm.transactions.Rollback
 import grails.testing.mixin.integration.Integration
 
 import spock.lang.*
-import geb.spock.*
+import grails.plugin.geb.ContainerGebSpec
 
 /**
  */
 @Integration(applicationClass = Application)
 @Rollback
-class PluginViewsControllerSpec extends GebSpec {
+class PluginViewsControllerSpec extends ContainerGebSpec {
 
     void "Test that when plugin templates are rendered they render correctly"() {
         when:"A view that renders plugin templates is visisted"

app1/src/integration-test/groovy/functionaltests/RedirectIntercetorSpec.groovy

@@ -2,13 +2,13 @@ package functionaltests
 
 import grails.testing.mixin.integration.Integration
 import spock.lang.*
-import geb.spock.*
+import grails.plugin.geb.ContainerGebSpec
 
 /**
  * @author graemerocher
  */
 @Integration(applicationClass = Application)
-class RedirectInterceptorSpec extends GebSpec {
+class RedirectInterceptorSpec extends ContainerGebSpec {
 
     void "Test that an interceptor that redirects works"() {
         when:

app1/src/integration-test/groovy/functionaltests/RedirectWithAndWithoutParamsFunctionalSpec.groovy

@@ -1,13 +1,13 @@
 package functionaltests
 
-import geb.spock.GebSpec
+import grails.plugin.geb.ContainerGebSpec
 import grails.gorm.transactions.Rollback
 import grails.testing.mixin.integration.Integration
 import spock.lang.Issue
 
 @Integration
 @Rollback
-class RedirectWithAndWithoutParamsFunctionalSpec extends GebSpec {
+class RedirectWithAndWithoutParamsFunctionalSpec extends ContainerGebSpec {
 
     @Issue('grails-core-#10965')
     void 'Params are not added to the url after a redirect even if they are passed to the redirect'() {

app1/src/integration-test/groovy/functionaltests/UploadControllerSpec.groovy

@@ -1,12 +1,12 @@
 package functionaltests
 
-import geb.spock.*
+import grails.plugin.geb.ContainerGebSpec
 import grails.testing.mixin.integration.Integration
 
 /**
  */
 @Integration(applicationClass = Application)
-class UploadControllerSpec extends GebSpec {
+class UploadControllerSpec extends ContainerGebSpec {
 
 
     void "Test file upload"() {

app1/src/integration-test/groovy/functionaltests/UriMatchingInterceptorFunctionalSpec.groovy

@@ -1,11 +1,11 @@
 package functionaltests
 
 
-import geb.spock.*
+import grails.plugin.geb.ContainerGebSpec
 import grails.testing.mixin.integration.Integration
 
 @Integration(applicationClass = Application)
-class UriMatchingInterceptorFunctionalSpec extends GebSpec {
+class UriMatchingInterceptorFunctionalSpec extends ContainerGebSpec {
 
     void "Test that an interceptor that redirects works"() {
         when:

app1/src/integration-test/groovy/functionaltests/ValidationFunctionalSpec.groovy

@@ -2,10 +2,10 @@ package functionaltests
 
 import grails.testing.mixin.integration.Integration
 import spock.lang.*
-import geb.spock.*
+import grails.plugin.geb.ContainerGebSpec
 
 @Integration(applicationClass = Application)
-class ValidationFunctionalSpec extends GebSpec {
+class ValidationFunctionalSpec extends ContainerGebSpec {
 
     @Issue('GRAILS-12039')
     void "Test validation of an invalid Hibernate entity"() {

app1/src/integration-test/groovy/functionaltests/chaining/ChainingToNamespacedControllersFunctionalSpec.groovy

@@ -1,11 +1,11 @@
 package functionaltests.chaining
 
 import functionaltests.Application
-import geb.spock.*
+import grails.plugin.geb.ContainerGebSpec
 import grails.testing.mixin.integration.Integration
 
 @Integration(applicationClass = Application)
-class ChainingToNamespacedControllersFunctionalSpec extends GebSpec {
+class ChainingToNamespacedControllersFunctionalSpec extends ContainerGebSpec {
 
     void "Test chaining to a namespaced controller"() {
         when:"A controller action chains to a namespaced controller"

app1/src/integration-test/groovy/functionaltests/scaffolding/BarFunctionalSpec.groovy

@@ -1,13 +1,13 @@
 package functionaltests.scaffolding
 
 import functionaltests.Application
-import geb.spock.GebSpec
+import grails.plugin.geb.ContainerGebSpec
 import grails.gorm.transactions.Rollback
 import grails.testing.mixin.integration.Integration
 
 @Integration(applicationClass = Application)
 @Rollback
-class BarFunctionalSpec extends GebSpec {
+class BarFunctionalSpec extends ContainerGebSpec {
 
     void "Test that a scaffolded view is resolved correctly"() {
         when: