Skip to content

Commit f2b0a6b

Browse files
committed
rebase fixes
1 parent 20298a2 commit f2b0a6b

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import java.lang.annotation.Target
3535
static final String DEFAULT_HOSTNAME_FROM_CONTAINER = GenericContainer.INTERNAL_HOST_HOSTNAME
3636
static final String DEFAULT_PROTOCOL = 'http'
3737
static final Class<? extends ContainerFileDetector> DEFAULT_FILE_DETECTOR = DefaultContainerFileDetector
38-
static final Class<? extends ContainerGebTestDescription> DEFAULT_TEST_DESCRIPTION = NullContainerGebTestDescription
38+
static final Class<? extends ContainerGebTestDescription> DEFAULT_TEST_DESCRIPTION = DefaultContainerGebTestDescription
3939

4040
/**
4141
* The protocol that the container's browser will use to access the server under test.
@@ -75,7 +75,7 @@ import java.lang.annotation.Target
7575
* @see grails.plugin.geb.DefaultContainerGebTestDescription DefaultContainerGebTestDescription
7676
* @see grails.plugin.geb.UselessContainerFileDetector UselessContainerFileDetector
7777
*/
78-
Class<? extends ContainerGebTestDescription> testDescription() default NullContainerGebTestDescription
78+
Class<? extends ContainerGebTestDescription> testDescription() default DefaultContainerGebTestDescription
7979
}
8080

8181
/**

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import org.testcontainers.lifecycle.TestDescription
2626
* <p>
2727
* Implementations must provide a zero-argument constructor to ensure compatibility with {@link java.util.ServiceLoader}.
2828
*
29+
* @since 4.2
2930
* @see GebRecordingTestListener
3031
*/
3132
@CompileStatic

0 commit comments

Comments
 (0)