Merge pull request #165 from matrei/merge-4.2.x-into-5.0.x

Merge 4.2.x into 5.0.x

Author: matrei

README.md

@@ -59,7 +59,10 @@ Parallel execution of `ContainerGebSpec` specifications is not currently support
 
 #### Custom Host Configuration
 
-The annotation `ContainerGebConfiguration` exists to customize the connection the container will use to access the application under test. The annotation is not required and `ContainerGebSpec` will use the default values in this annotation if it's not present.  A traditional `GebConfig.groovy` can be provided to configure non-container specific settings.
+The annotation `ContainerGebConfiguration` exists to customize the connection the container will use to access the application under test.
+The annotation is not required and `ContainerGebSpec` will use the default values in this annotation if it's not present.
+
+The interface `IContainerGebConfiguration` exists as an inheritable version of the annotation.
 
 #### Reporting
 
@@ -73,10 +76,12 @@ To configure reporting, enable it using the `recording` property on the annotati
 
 By default, no test recording will be performed.  Various system properties exist to change the recording behavior.  To set them, you can set them in your `build.gradle` file like so:
 
-    tasks.withType(Test) {
-      useJUnitPlatform()
-      systemProperty 'grails.geb.recording.mode', 'RECORD_ALL'
-    }
+```groovy
+tasks.withType(Test).configureEach {
+    useJUnitPlatform()
+    systemProperty('grails.geb.recording.mode', 'RECORD_ALL')
+}
+```
 
 * `grails.geb.recording.mode`
   * purpose: which tests to record

spock-container-test-app/src/integration-test/groovy/org/demo/spock/InheritedConfigSpec.groovy

@@ -0,0 +1,88 @@
+package org.demo.spock
+
+import grails.plugin.geb.ContainerGebConfiguration
+import grails.plugin.geb.IContainerGebConfiguration
+import grails.plugin.geb.ContainerGebSpec
+import grails.testing.mixin.integration.Integration
+
+/**
+ * Adaptation of {@link ServerNameControllerSpec}
+ */
+@Integration
+class SuperSpec extends ContainerGebSpec implements IContainerGebConfiguration {
+    @Override
+    String hostName() {
+        return 'super.example.com'
+    }
+}
+
+@Integration
+@ContainerGebConfiguration(hostName = 'not.example.com')
+class NotSuperSpec extends ContainerGebSpec {}
+
+@Integration
+class InheritedConfigSpec extends SuperSpec {
+    void 'should show the right server name when visiting /serverName'() {
+        when: 'visiting the server name controller'
+        go '/serverName'
+
+        then: 'the emitted hostname is correct'
+        $('p').text() == 'Server name: super.example.com'
+    }
+}
+
+@Integration
+class NotInheritedConfigSpec extends NotSuperSpec {
+    void 'should show the right server name when visiting /serverName'() {
+        when: 'visiting the server name controller'
+        go '/serverName'
+
+        then: 'the emitted hostname is correct'
+        $('p').text() != 'Server name: not.example.com'
+    }
+}
+
+@Integration
+class ChildPreferenceInheritedConfigSpec extends SuperSpec {
+    @Override
+    String hostName() {
+        return 'child.example.com'
+    }
+    
+    void 'should show the right server name when visiting /serverName'() {
+        when: 'visiting the server name controller'
+        go '/serverName'
+
+        then: 'the emitted hostname is correct'
+        $('p').text() == 'Server name: child.example.com'
+
+        when:
+        report('whatever')
+
+        then:
+        // geb.test.GebTestManager: "Reporting has not been enabled on this GebTestManager yet report() was called"
+        Throwable t = thrown(Exception)
+        t.message.contains("not been enabled")
+    }
+}
+
+// No sane person would do this, but lets test anyway
+@Integration
+class SuperSuperInheritedConfigSpec extends SuperSpec {
+    @Override
+    boolean reporting() {
+        return true
+    }
+}
+
+@Integration
+class MultipleInheritanceSpec extends SuperSuperInheritedConfigSpec {
+    void 'should show the right server name when visiting /serverName'() {
+        when: 'visiting the server name controller'
+        go '/serverName'
+
+        then: 'the emitted hostname is correct'
+        $('p').text() == 'Server name: super.example.com'
+        report('multi inheritance report')
+    }
+}

src/testFixtures/groovy/grails/plugin/geb/ContainerGebConfiguration.groovy

@@ -65,3 +65,27 @@ import java.lang.annotation.Target
      */
     Class<? extends ContainerFileDetector> fileDetector() default DefaultContainerFileDetector
 }
+
+/**
+ * Inheritable version of {@link ContainerGebConfiguration}
+ *
+ * @since 4.2
+ */
+interface IContainerGebConfiguration {
+
+    default String protocol() {
+        ContainerGebConfiguration.DEFAULT_PROTOCOL
+    }
+
+    default String hostName() {
+        ContainerGebConfiguration.DEFAULT_HOSTNAME_FROM_CONTAINER
+    }
+
+    default boolean reporting() {
+        false
+    }
+
+    default Class<? extends ContainerFileDetector> fileDetector() {
+        ContainerGebConfiguration.DEFAULT_FILE_DETECTOR
+    }
+}

src/testFixtures/groovy/grails/plugin/geb/WebDriverContainerHolder.groovy

@@ -212,9 +212,17 @@ class WebDriverContainerHolder {
         Class<? extends ContainerFileDetector> fileDetector
 
         WebDriverContainerConfiguration(SpecInfo spec) {
-            ContainerGebConfiguration configuration = spec.annotations.find {
-                it.annotationType() == ContainerGebConfiguration
-            } as ContainerGebConfiguration
+            ContainerGebConfiguration configuration
+
+            // Check if the class implements the interface
+            if (IContainerGebConfiguration.isAssignableFrom(spec.reflection)) {
+                configuration = spec.reflection.getConstructor().newInstance() as ContainerGebConfiguration
+            } else {
+                // Check for the annotation
+                configuration = spec.annotations.find {
+                    it.annotationType() == ContainerGebConfiguration
+                } as ContainerGebConfiguration
+            }
 
             protocol = configuration?.protocol() ?: ContainerGebConfiguration.DEFAULT_PROTOCOL
             hostName = configuration?.hostName() ?: ContainerGebConfiguration.DEFAULT_HOSTNAME_FROM_CONTAINER