Merge branch '4.1.x' into 5.0.x

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

@@ -65,7 +65,7 @@ abstract class ContainerGebSpec extends Specification implements ContainerAwareD
     static BrowserWebDriverContainer container
 
     /**
-     * The reporter that GebShould use when reporting is enabled.
+     * The reporter that Geb should use when reporting is enabled.
      */
     Reporter createReporter() {
         new CompositeReporter(new PageSourceReporter())

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

@@ -37,12 +37,8 @@ class GebRecordingTestListener extends AbstractRunListener {
 
     WebDriverContainerHolder containerHolder
     ErrorInfo errorInfo
-    SpecInfo spec
-    LocalDateTime runDate
 
-    GebRecordingTestListener(WebDriverContainerHolder containerHolder, SpecInfo spec) {
-        this.spec = spec
-        this.runDate = runDate
+    GebRecordingTestListener(WebDriverContainerHolder containerHolder) {
         this.containerHolder = containerHolder
     }
 

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

@@ -111,8 +111,7 @@ class GrailsContainerGebExtension implements IGlobalExtension {
             addGebExtensionOnFailureReporter(spec)
 
             GebRecordingTestListener recordingListener = new GebRecordingTestListener(
-                    holder,
-                    spec
+                holder
             )
             spec.addListener(recordingListener)
         }

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

@@ -116,7 +116,7 @@ class WebDriverContainerHolder {
 
         ConfigObject configObject = new ConfigObject()
         if (currentConfiguration.reporting) {
-            configObject.reportsDir = grailsGebSettings.getReportingDirectory()
+            configObject.reportsDir = grailsGebSettings.reportingDirectory
             configObject.reporter = (invocation.sharedInstance as ContainerGebSpec).createReporter()
         }
 
@@ -132,7 +132,7 @@ class WebDriverContainerHolder {
         // real url cannot be set (it will be checked as part of the geb test manager startup in reporting mode)
         // set the url to localhost, which the selenium server should respond to (albeit with an error that will be ignored)
 
-        currentBrowser.baseUrl = "http://localhost"
+        currentBrowser.baseUrl = 'http://localhost'
 
         testManager = createTestManager()
 
@@ -167,13 +167,13 @@ class WebDriverContainerHolder {
 
     private static String getHostIp() {
         try {
-            PortForwardingContainer.getDeclaredMethod("getNetwork").with {
+            PortForwardingContainer.getDeclaredMethod('getNetwork').with {
                 accessible = true
                 Optional<ContainerNetwork> network = invoke(PortForwardingContainer.INSTANCE) as Optional<ContainerNetwork>
                 return network.get().ipAddress
             }
         } catch (Exception e) {
-            throw new RuntimeException("Could not access network from PortForwardingContainer", e)
+            throw new RuntimeException('Could not access network from PortForwardingContainer', e)
         }
     }