This is an automated email from the ASF dual-hosted git repository. cmarcum pushed a commit to branch task/geb-testcontainers in repository https://gitbox.apache.org/repos/asf/groovy-geb.git
commit ac4b631cf7ab2b157cc606f3591a2a3b2c6d24a3 Author: Carl Marcum <[email protected]> AuthorDate: Wed Feb 25 18:52:24 2026 -0500 rename files containing Grails. --- .../groovy/org/demo/spock/PerTestRecordingSpec.groovy | 2 +- ...rGebExtension.groovy => ContainerGebExtension.groovy} | 4 ++-- ...ilsGebSettings.groovy => GebContainerSettings.groovy} | 6 +++--- .../grails/plugin/geb/WebDriverContainerHolder.groovy | 16 ++++++++-------- ...org.spockframework.runtime.extension.IGlobalExtension | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/integration/geb-testcontainers/src/integration-test/groovy/org/demo/spock/PerTestRecordingSpec.groovy b/integration/geb-testcontainers/src/integration-test/groovy/org/demo/spock/PerTestRecordingSpec.groovy index 1eb0bce2..04eb63fd 100644 --- a/integration/geb-testcontainers/src/integration-test/groovy/org/demo/spock/PerTestRecordingSpec.groovy +++ b/integration/geb-testcontainers/src/integration-test/groovy/org/demo/spock/PerTestRecordingSpec.groovy @@ -42,7 +42,7 @@ class PerTestRecordingSpec extends ContainerGebSpec { void 'the recordings of the previous two tests are different'() { when: 'getting the configured base recording directory' - // Logic from GrailsGebSettings + // Logic from GebContainerSettings def recordingDirectoryName = System.getProperty( 'grails.geb.recording.directory', 'build/gebContainer/recordings' diff --git a/integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/GrailsContainerGebExtension.groovy b/integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/ContainerGebExtension.groovy similarity index 97% rename from integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/GrailsContainerGebExtension.groovy rename to integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/ContainerGebExtension.groovy index 28584375..02d4eaeb 100644 --- a/integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/GrailsContainerGebExtension.groovy +++ b/integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/ContainerGebExtension.groovy @@ -44,7 +44,7 @@ import java.time.LocalDateTime */ @Slf4j @CompileStatic -class GrailsContainerGebExtension implements IGlobalExtension { +class ContainerGebExtension implements IGlobalExtension { ExclusiveResource exclusiveResource WebDriverContainerHolder holder @@ -56,7 +56,7 @@ class GrailsContainerGebExtension implements IGlobalExtension { ResourceAccessMode.READ_WRITE ) holder = new WebDriverContainerHolder( - new GrailsGebSettings(LocalDateTime.now()) + new GebContainerSettings(LocalDateTime.now()) ) addShutdownHook { holder.stop() diff --git a/integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/GrailsGebSettings.groovy b/integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/GebContainerSettings.groovy similarity index 98% rename from integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/GrailsGebSettings.groovy rename to integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/GebContainerSettings.groovy index 5326866c..823e9520 100644 --- a/integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/GrailsGebSettings.groovy +++ b/integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/GebContainerSettings.groovy @@ -32,14 +32,14 @@ import static org.testcontainers.containers.VncRecordingContainer.VncRecordingFo /** * Handles parsing various recording configuration - * used by {@link GrailsContainerGebExtension}. + * used by {@link ContainerGebExtension}. * * @author James Daugherty * @since 4.1 */ @Slf4j @CompileStatic -class GrailsGebSettings { +class GebContainerSettings { public static final boolean DEFAULT_AT_CHECK_WAITING = false private static final VncRecordingMode DEFAULT_RECORDING_MODE = VncRecordingMode.SKIP @@ -64,7 +64,7 @@ class GrailsGebSettings { Number timeout Number retryInterval - GrailsGebSettings(LocalDateTime startTime) { + GebContainerSettings(LocalDateTime startTime) { tracingEnabled = getBooleanProperty('grails.geb.tracing.enabled', false) recordingDirectoryName = System.getProperty('grails.geb.recording.directory', 'build/gebContainer/recordings') reportingDirectoryName = System.getProperty('grails.geb.reporting.directory', 'build/gebContainer/reports') diff --git a/integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/WebDriverContainerHolder.groovy b/integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/WebDriverContainerHolder.groovy index d7013715..b8ba2a05 100644 --- a/integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/WebDriverContainerHolder.groovy +++ b/integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/WebDriverContainerHolder.groovy @@ -52,10 +52,10 @@ import org.testcontainers.utility.DockerImageName import grails.plugin.geb.serviceloader.ServiceRegistry -import static GrailsGebSettings.DEFAULT_AT_CHECK_WAITING -import static GrailsGebSettings.DEFAULT_TIMEOUT_IMPLICITLY_WAIT -import static GrailsGebSettings.DEFAULT_TIMEOUT_PAGE_LOAD -import static GrailsGebSettings.DEFAULT_TIMEOUT_SCRIPT +import static GebContainerSettings.DEFAULT_AT_CHECK_WAITING +import static GebContainerSettings.DEFAULT_TIMEOUT_IMPLICITLY_WAIT +import static GebContainerSettings.DEFAULT_TIMEOUT_PAGE_LOAD +import static GebContainerSettings.DEFAULT_TIMEOUT_SCRIPT /** * Responsible for initializing a {@link org.testcontainers.containers.BrowserWebDriverContainer} @@ -81,13 +81,13 @@ class WebDriverContainerHolder { private static final String CI_PROPERTY = 'CI' private static final String LOCALHOST_IP = '127.0.0.1' - GrailsGebSettings settings + GebContainerSettings settings GebTestManager testManager Browser browser BrowserWebDriverContainer container WebDriverContainerConfiguration containerConf - WebDriverContainerHolder(GrailsGebSettings settings) { + WebDriverContainerHolder(GebContainerSettings settings) { this.settings = settings } @@ -385,9 +385,9 @@ class WebDriverContainerHolder { ) } - private static void applyTimeouts(Browser browser, GrailsGebSettings settings) { + private static void applyTimeouts(Browser browser, GebContainerSettings settings) { // Overwrite `GebConfig` timeouts with values explicitly set in - // `GrailsGebSettings` (via system properties) + // `GebContainerSettings` (via system properties) if (settings.implicitlyWait != DEFAULT_TIMEOUT_IMPLICITLY_WAIT) { browser.driver.manage().timeouts().implicitlyWait(Duration.ofSeconds(settings.implicitlyWait)) } diff --git a/integration/geb-testcontainers/src/main/resources/META-INF/services/org.spockframework.runtime.extension.IGlobalExtension b/integration/geb-testcontainers/src/main/resources/META-INF/services/org.spockframework.runtime.extension.IGlobalExtension index cd6ea72f..803a0a2f 100644 --- a/integration/geb-testcontainers/src/main/resources/META-INF/services/org.spockframework.runtime.extension.IGlobalExtension +++ b/integration/geb-testcontainers/src/main/resources/META-INF/services/org.spockframework.runtime.extension.IGlobalExtension @@ -1 +1 @@ -grails.plugin.geb.GrailsContainerGebExtension \ No newline at end of file +grails.plugin.geb.ContainerGebExtension \ No newline at end of file
