This is an automated email from the ASF dual-hosted git repository. jonnybot pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/groovy-geb.git
commit c9ca9a4300ab5fd1835c8db6a91d4510f1d1d161 Author: Carl Marcum <[email protected]> AuthorDate: Sat Mar 14 15:49:16 2026 -0400 rename geb-testontainers packages to geb.testcontainers --- .../BaseUrlConfigFromClassSpec.groovy | 3 +- .../ContainerFileDetectorAnnotationSpec.groovy | 6 +-- .../ContainerFileDetectorDefaultSpec.groovy | 8 +-- .../ContainerFileDetectorSpockSpec.groovy | 8 ++- .../ContainerGebSpecWithServer.groovy | 4 +- .../testcontainers}/DownloadSupportSpec.groovy | 4 +- .../testcontainers}/GebConfigSpec.groovy | 4 +- .../HostNameConfigurationSpec.groovy | 5 +- .../testcontainers}/InheritedConfigSpec.groovy | 7 +-- .../testcontainers}/PageDelegateSpec.groovy | 4 +- .../testcontainers}/PerTestRecordingSpec.groovy | 3 +- .../testcontainers}/PortConfigFromClassSpec.groovy | 3 +- .../testcontainers}/RootPageSpec.groovy | 6 +-- .../testcontainers}/TestFileServer.groovy | 2 +- .../testcontainers}/TestFileServerSpec.groovy | 3 +- .../spock => geb/testcontainers}/UploadSpec.groovy | 6 +-- .../testcontainers}/pages/HomePage.groovy | 2 +- .../testcontainers}/pages/UploadPage.groovy | 2 +- .../testcontainers}/pages/UploadSuccessPage.groovy | 2 +- .../testcontainers}/ContainerFileDetector.groovy | 2 +- .../ContainerGebConfiguration.groovy | 8 +-- .../testcontainers}/ContainerGebExtension.groovy | 6 +-- .../testcontainers}/ContainerGebSpec.groovy | 16 +++--- .../ContainerGebTestDescription.groovy | 2 +- .../DefaultContainerFileDetector.groovy | 2 +- .../testcontainers}/GebContainerSettings.groovy | 2 +- .../testcontainers}/GebOnFailureReporter.groovy | 4 +- .../GebRecordingTestListener.groovy | 2 +- .../WebDriverContainerHolder.groovy | 6 +-- .../serviceloader/ServiceRegistry.groovy | 2 +- .../testcontainers}/support/BrowserType.groovy | 2 +- .../support/ContainerGebFileInputSource.groovy | 2 +- .../support/ContainerSupport.groovy | 4 +- .../support/LocalhostDownloadSupport.groovy | 2 +- .../support/ReportingSupport.groovy | 4 +- .../support/delegate/BrowserDelegate.groovy | 4 +- .../delegate/DownloadSupportDelegate.groovy | 58 +++++++++++----------- .../support/delegate/DriverDelegate.groovy | 4 +- .../support/delegate/PageDelegate.groovy | 4 +- ...ockframework.runtime.extension.IGlobalExtension | 2 +- .../testcontainers}/BaseUrlConfigSpec.groovy | 3 +- 41 files changed, 103 insertions(+), 120 deletions(-) diff --git a/integration/geb-testcontainers/src/integration-test/groovy/org/demo/spock/BaseUrlConfigFromClassSpec.groovy b/integration/geb-testcontainers/src/integration-test/groovy/geb/testcontainers/BaseUrlConfigFromClassSpec.groovy similarity index 95% rename from integration/geb-testcontainers/src/integration-test/groovy/org/demo/spock/BaseUrlConfigFromClassSpec.groovy rename to integration/geb-testcontainers/src/integration-test/groovy/geb/testcontainers/BaseUrlConfigFromClassSpec.groovy index 0c11e4e9..2eaf8129 100644 --- a/integration/geb-testcontainers/src/integration-test/groovy/org/demo/spock/BaseUrlConfigFromClassSpec.groovy +++ b/integration/geb-testcontainers/src/integration-test/groovy/geb/testcontainers/BaseUrlConfigFromClassSpec.groovy @@ -16,9 +16,8 @@ * specific language governing permissions and limitations * under the License. */ -package org.demo.spock +package geb.testcontainers -import grails.plugin.geb.ContainerGebSpec import spock.lang.Narrative /** diff --git a/integration/geb-testcontainers/src/integration-test/groovy/org/demo/spock/ContainerFileDetectorAnnotationSpec.groovy b/integration/geb-testcontainers/src/integration-test/groovy/geb/testcontainers/ContainerFileDetectorAnnotationSpec.groovy similarity index 90% rename from integration/geb-testcontainers/src/integration-test/groovy/org/demo/spock/ContainerFileDetectorAnnotationSpec.groovy rename to integration/geb-testcontainers/src/integration-test/groovy/geb/testcontainers/ContainerFileDetectorAnnotationSpec.groovy index 195f66db..040ef620 100644 --- a/integration/geb-testcontainers/src/integration-test/groovy/org/demo/spock/ContainerFileDetectorAnnotationSpec.groovy +++ b/integration/geb-testcontainers/src/integration-test/groovy/geb/testcontainers/ContainerFileDetectorAnnotationSpec.groovy @@ -16,11 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.demo.spock +package geb.testcontainers -import grails.plugin.geb.ContainerGebConfiguration -import grails.plugin.geb.UselessContainerFileDetector -import org.demo.spock.pages.UploadPage +import geb.testcontainers.pages.UploadPage import org.openqa.selenium.WebDriverException /** diff --git a/integration/geb-testcontainers/src/integration-test/groovy/org/demo/spock/ContainerFileDetectorDefaultSpec.groovy b/integration/geb-testcontainers/src/integration-test/groovy/geb/testcontainers/ContainerFileDetectorDefaultSpec.groovy similarity index 88% rename from integration/geb-testcontainers/src/integration-test/groovy/org/demo/spock/ContainerFileDetectorDefaultSpec.groovy rename to integration/geb-testcontainers/src/integration-test/groovy/geb/testcontainers/ContainerFileDetectorDefaultSpec.groovy index e23b3942..4a02a00e 100644 --- a/integration/geb-testcontainers/src/integration-test/groovy/org/demo/spock/ContainerFileDetectorDefaultSpec.groovy +++ b/integration/geb-testcontainers/src/integration-test/groovy/geb/testcontainers/ContainerFileDetectorDefaultSpec.groovy @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.demo.spock +package geb.testcontainers -import org.demo.spock.pages.UploadSuccessPage -import org.demo.spock.pages.UploadPage +import geb.testcontainers.pages.UploadSuccessPage +import geb.testcontainers.pages.UploadPage /** * Altered copy of {@link UploadSpec} that depends on default of - * {@link grails.plugin.geb.ContainerGebConfiguration#fileDetector} to be + * {@link geb.testcontainers.ContainerGebConfiguration#fileDetector} to be * {@link org.openqa.selenium.remote.LocalFileDetector} */ class ContainerFileDetectorDefaultSpec extends ContainerGebSpecWithServer { diff --git a/integration/geb-testcontainers/src/integration-test/groovy/org/demo/spock/ContainerFileDetectorSpockSpec.groovy b/integration/geb-testcontainers/src/integration-test/groovy/geb/testcontainers/ContainerFileDetectorSpockSpec.groovy similarity index 89% rename from integration/geb-testcontainers/src/integration-test/groovy/org/demo/spock/ContainerFileDetectorSpockSpec.groovy rename to integration/geb-testcontainers/src/integration-test/groovy/geb/testcontainers/ContainerFileDetectorSpockSpec.groovy index af93dea8..02267980 100644 --- a/integration/geb-testcontainers/src/integration-test/groovy/org/demo/spock/ContainerFileDetectorSpockSpec.groovy +++ b/integration/geb-testcontainers/src/integration-test/groovy/geb/testcontainers/ContainerFileDetectorSpockSpec.groovy @@ -16,12 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.demo.spock +package geb.testcontainers -import grails.plugin.geb.ContainerFileDetector -import grails.plugin.geb.UselessContainerFileDetector -import grails.plugin.geb.serviceloader.ServiceRegistry -import org.demo.spock.pages.UploadPage +import geb.testcontainers.serviceloader.ServiceRegistry +import geb.testcontainers.pages.UploadPage import org.openqa.selenium.WebDriverException import spock.lang.PendingFeature diff --git a/integration/geb-testcontainers/src/integration-test/groovy/org/demo/spock/ContainerGebSpecWithServer.groovy b/integration/geb-testcontainers/src/integration-test/groovy/geb/testcontainers/ContainerGebSpecWithServer.groovy similarity index 94% rename from integration/geb-testcontainers/src/integration-test/groovy/org/demo/spock/ContainerGebSpecWithServer.groovy rename to integration/geb-testcontainers/src/integration-test/groovy/geb/testcontainers/ContainerGebSpecWithServer.groovy index 4381c82b..501365b5 100644 --- a/integration/geb-testcontainers/src/integration-test/groovy/org/demo/spock/ContainerGebSpecWithServer.groovy +++ b/integration/geb-testcontainers/src/integration-test/groovy/geb/testcontainers/ContainerGebSpecWithServer.groovy @@ -16,9 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.demo.spock - -import grails.plugin.geb.ContainerGebSpec +package geb.testcontainers /** * ContainerGebSpec with a Simple File Server diff --git a/integration/geb-testcontainers/src/integration-test/groovy/org/demo/spock/DownloadSupportSpec.groovy b/integration/geb-testcontainers/src/integration-test/groovy/geb/testcontainers/DownloadSupportSpec.groovy similarity index 95% rename from integration/geb-testcontainers/src/integration-test/groovy/org/demo/spock/DownloadSupportSpec.groovy rename to integration/geb-testcontainers/src/integration-test/groovy/geb/testcontainers/DownloadSupportSpec.groovy index cafb8762..2884a554 100644 --- a/integration/geb-testcontainers/src/integration-test/groovy/org/demo/spock/DownloadSupportSpec.groovy +++ b/integration/geb-testcontainers/src/integration-test/groovy/geb/testcontainers/DownloadSupportSpec.groovy @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.demo.spock +package geb.testcontainers -import org.demo.spock.pages.HomePage +import geb.testcontainers.pages.HomePage import spock.lang.Title @Title("should be able to use download methods") diff --git a/integration/geb-testcontainers/src/integration-test/groovy/org/demo/spock/GebConfigSpec.groovy b/integration/geb-testcontainers/src/integration-test/groovy/geb/testcontainers/GebConfigSpec.groovy similarity index 97% rename from integration/geb-testcontainers/src/integration-test/groovy/org/demo/spock/GebConfigSpec.groovy rename to integration/geb-testcontainers/src/integration-test/groovy/geb/testcontainers/GebConfigSpec.groovy index d57d23bf..57a46113 100644 --- a/integration/geb-testcontainers/src/integration-test/groovy/org/demo/spock/GebConfigSpec.groovy +++ b/integration/geb-testcontainers/src/integration-test/groovy/geb/testcontainers/GebConfigSpec.groovy @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.demo.spock +package geb.testcontainers -import org.demo.spock.pages.HomePage +import geb.testcontainers.pages.HomePage import org.openqa.selenium.remote.RemoteWebDriver /** diff --git a/integration/geb-testcontainers/src/integration-test/groovy/org/demo/spock/HostNameConfigurationSpec.groovy b/integration/geb-testcontainers/src/integration-test/groovy/geb/testcontainers/HostNameConfigurationSpec.groovy similarity index 93% rename from integration/geb-testcontainers/src/integration-test/groovy/org/demo/spock/HostNameConfigurationSpec.groovy rename to integration/geb-testcontainers/src/integration-test/groovy/geb/testcontainers/HostNameConfigurationSpec.groovy index 16d202ad..1b3b7a7b 100644 --- a/integration/geb-testcontainers/src/integration-test/groovy/org/demo/spock/HostNameConfigurationSpec.groovy +++ b/integration/geb-testcontainers/src/integration-test/groovy/geb/testcontainers/HostNameConfigurationSpec.groovy @@ -16,10 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.demo.spock +package geb.testcontainers -import org.demo.spock.pages.HomePage -import grails.plugin.geb.ContainerGebConfiguration +import geb.testcontainers.pages.HomePage import spock.lang.Title /** diff --git a/integration/geb-testcontainers/src/integration-test/groovy/org/demo/spock/InheritedConfigSpec.groovy b/integration/geb-testcontainers/src/integration-test/groovy/geb/testcontainers/InheritedConfigSpec.groovy similarity index 95% rename from integration/geb-testcontainers/src/integration-test/groovy/org/demo/spock/InheritedConfigSpec.groovy rename to integration/geb-testcontainers/src/integration-test/groovy/geb/testcontainers/InheritedConfigSpec.groovy index a9977a01..764f3457 100644 --- a/integration/geb-testcontainers/src/integration-test/groovy/org/demo/spock/InheritedConfigSpec.groovy +++ b/integration/geb-testcontainers/src/integration-test/groovy/geb/testcontainers/InheritedConfigSpec.groovy @@ -16,12 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.demo.spock +package geb.testcontainers -import org.demo.spock.pages.HomePage - -import grails.plugin.geb.ContainerGebConfiguration -import grails.plugin.geb.IContainerGebConfiguration +import geb.testcontainers.pages.HomePage /** * Adaptation of {@link HostNameConfigurationSpec} diff --git a/integration/geb-testcontainers/src/integration-test/groovy/org/demo/spock/PageDelegateSpec.groovy b/integration/geb-testcontainers/src/integration-test/groovy/geb/testcontainers/PageDelegateSpec.groovy similarity index 93% rename from integration/geb-testcontainers/src/integration-test/groovy/org/demo/spock/PageDelegateSpec.groovy rename to integration/geb-testcontainers/src/integration-test/groovy/geb/testcontainers/PageDelegateSpec.groovy index ee21ed05..dd81fc45 100644 --- a/integration/geb-testcontainers/src/integration-test/groovy/org/demo/spock/PageDelegateSpec.groovy +++ b/integration/geb-testcontainers/src/integration-test/groovy/geb/testcontainers/PageDelegateSpec.groovy @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.demo.spock +package geb.testcontainers -import org.demo.spock.pages.UploadPage +import geb.testcontainers.pages.UploadPage class PageDelegateSpec extends ContainerGebSpecWithServer { diff --git a/integration/geb-testcontainers/src/integration-test/groovy/org/demo/spock/PerTestRecordingSpec.groovy b/integration/geb-testcontainers/src/integration-test/groovy/geb/testcontainers/PerTestRecordingSpec.groovy similarity index 98% rename from integration/geb-testcontainers/src/integration-test/groovy/org/demo/spock/PerTestRecordingSpec.groovy rename to integration/geb-testcontainers/src/integration-test/groovy/geb/testcontainers/PerTestRecordingSpec.groovy index 9d96125c..2245adfd 100644 --- a/integration/geb-testcontainers/src/integration-test/groovy/org/demo/spock/PerTestRecordingSpec.groovy +++ b/integration/geb-testcontainers/src/integration-test/groovy/geb/testcontainers/PerTestRecordingSpec.groovy @@ -16,9 +16,8 @@ * specific language governing permissions and limitations * under the License. */ -package org.demo.spock +package geb.testcontainers -import grails.plugin.geb.ContainerGebSpec import spock.lang.Stepwise @Stepwise // execute feature methods in declared order diff --git a/integration/geb-testcontainers/src/integration-test/groovy/org/demo/spock/PortConfigFromClassSpec.groovy b/integration/geb-testcontainers/src/integration-test/groovy/geb/testcontainers/PortConfigFromClassSpec.groovy similarity index 96% rename from integration/geb-testcontainers/src/integration-test/groovy/org/demo/spock/PortConfigFromClassSpec.groovy rename to integration/geb-testcontainers/src/integration-test/groovy/geb/testcontainers/PortConfigFromClassSpec.groovy index 3947d077..cdd10867 100644 --- a/integration/geb-testcontainers/src/integration-test/groovy/org/demo/spock/PortConfigFromClassSpec.groovy +++ b/integration/geb-testcontainers/src/integration-test/groovy/geb/testcontainers/PortConfigFromClassSpec.groovy @@ -16,9 +16,8 @@ * specific language governing permissions and limitations * under the License. */ -package org.demo.spock +package geb.testcontainers -import grails.plugin.geb.ContainerGebSpec import spock.lang.Narrative /** diff --git a/integration/geb-testcontainers/src/integration-test/groovy/org/demo/spock/RootPageSpec.groovy b/integration/geb-testcontainers/src/integration-test/groovy/geb/testcontainers/RootPageSpec.groovy similarity index 93% rename from integration/geb-testcontainers/src/integration-test/groovy/org/demo/spock/RootPageSpec.groovy rename to integration/geb-testcontainers/src/integration-test/groovy/geb/testcontainers/RootPageSpec.groovy index 2f5a053b..371d5144 100644 --- a/integration/geb-testcontainers/src/integration-test/groovy/org/demo/spock/RootPageSpec.groovy +++ b/integration/geb-testcontainers/src/integration-test/groovy/geb/testcontainers/RootPageSpec.groovy @@ -16,14 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.demo.spock +package geb.testcontainers import geb.report.CompositeReporter import geb.report.PageSourceReporter import geb.report.Reporter -import org.demo.spock.pages.HomePage - -import grails.plugin.geb.ContainerGebConfiguration +import geb.testcontainers.pages.HomePage /** * See https://grails.apache.org/docs/latest/guide/testing.html#functionalTesting and https://groovy.apache.org/geb/manual/current/ diff --git a/integration/geb-testcontainers/src/integration-test/groovy/org/demo/spock/TestFileServer.groovy b/integration/geb-testcontainers/src/integration-test/groovy/geb/testcontainers/TestFileServer.groovy similarity index 98% rename from integration/geb-testcontainers/src/integration-test/groovy/org/demo/spock/TestFileServer.groovy rename to integration/geb-testcontainers/src/integration-test/groovy/geb/testcontainers/TestFileServer.groovy index f291320a..38f01bb4 100644 --- a/integration/geb-testcontainers/src/integration-test/groovy/org/demo/spock/TestFileServer.groovy +++ b/integration/geb-testcontainers/src/integration-test/groovy/geb/testcontainers/TestFileServer.groovy @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.demo.spock +package geb.testcontainers import com.sun.net.httpserver.HttpServer import com.sun.net.httpserver.SimpleFileServer diff --git a/integration/geb-testcontainers/src/integration-test/groovy/org/demo/spock/TestFileServerSpec.groovy b/integration/geb-testcontainers/src/integration-test/groovy/geb/testcontainers/TestFileServerSpec.groovy similarity index 96% rename from integration/geb-testcontainers/src/integration-test/groovy/org/demo/spock/TestFileServerSpec.groovy rename to integration/geb-testcontainers/src/integration-test/groovy/geb/testcontainers/TestFileServerSpec.groovy index 696788f1..eefd8aae 100644 --- a/integration/geb-testcontainers/src/integration-test/groovy/org/demo/spock/TestFileServerSpec.groovy +++ b/integration/geb-testcontainers/src/integration-test/groovy/geb/testcontainers/TestFileServerSpec.groovy @@ -16,9 +16,8 @@ * specific language governing permissions and limitations * under the License. */ -package org.demo.spock +package geb.testcontainers -import grails.plugin.geb.ContainerGebSpec import spock.lang.Narrative /** diff --git a/integration/geb-testcontainers/src/integration-test/groovy/org/demo/spock/UploadSpec.groovy b/integration/geb-testcontainers/src/integration-test/groovy/geb/testcontainers/UploadSpec.groovy similarity index 96% rename from integration/geb-testcontainers/src/integration-test/groovy/org/demo/spock/UploadSpec.groovy rename to integration/geb-testcontainers/src/integration-test/groovy/geb/testcontainers/UploadSpec.groovy index d4fa6fc3..5d24ee36 100644 --- a/integration/geb-testcontainers/src/integration-test/groovy/org/demo/spock/UploadSpec.groovy +++ b/integration/geb-testcontainers/src/integration-test/groovy/geb/testcontainers/UploadSpec.groovy @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.demo.spock +package geb.testcontainers import geb.module.FileInput -import org.demo.spock.pages.UploadSuccessPage +import geb.testcontainers.pages.UploadSuccessPage -import org.demo.spock.pages.UploadPage +import geb.testcontainers.pages.UploadPage import spock.lang.IgnoreIf import spock.lang.Requires import spock.lang.TempDir diff --git a/integration/geb-testcontainers/src/integration-test/groovy/org/demo/spock/pages/HomePage.groovy b/integration/geb-testcontainers/src/integration-test/groovy/geb/testcontainers/pages/HomePage.groovy similarity index 96% rename from integration/geb-testcontainers/src/integration-test/groovy/org/demo/spock/pages/HomePage.groovy rename to integration/geb-testcontainers/src/integration-test/groovy/geb/testcontainers/pages/HomePage.groovy index 418ab81a..2be40b65 100644 --- a/integration/geb-testcontainers/src/integration-test/groovy/org/demo/spock/pages/HomePage.groovy +++ b/integration/geb-testcontainers/src/integration-test/groovy/geb/testcontainers/pages/HomePage.groovy @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.demo.spock.pages +package geb.testcontainers.pages import geb.Page diff --git a/integration/geb-testcontainers/src/integration-test/groovy/org/demo/spock/pages/UploadPage.groovy b/integration/geb-testcontainers/src/integration-test/groovy/geb/testcontainers/pages/UploadPage.groovy similarity index 97% rename from integration/geb-testcontainers/src/integration-test/groovy/org/demo/spock/pages/UploadPage.groovy rename to integration/geb-testcontainers/src/integration-test/groovy/geb/testcontainers/pages/UploadPage.groovy index 6fcea215..464de77d 100644 --- a/integration/geb-testcontainers/src/integration-test/groovy/org/demo/spock/pages/UploadPage.groovy +++ b/integration/geb-testcontainers/src/integration-test/groovy/geb/testcontainers/pages/UploadPage.groovy @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.demo.spock.pages +package geb.testcontainers.pages import geb.Page import geb.module.FileInput diff --git a/integration/geb-testcontainers/src/integration-test/groovy/org/demo/spock/pages/UploadSuccessPage.groovy b/integration/geb-testcontainers/src/integration-test/groovy/geb/testcontainers/pages/UploadSuccessPage.groovy similarity index 96% rename from integration/geb-testcontainers/src/integration-test/groovy/org/demo/spock/pages/UploadSuccessPage.groovy rename to integration/geb-testcontainers/src/integration-test/groovy/geb/testcontainers/pages/UploadSuccessPage.groovy index cde7f5f5..2566ae38 100644 --- a/integration/geb-testcontainers/src/integration-test/groovy/org/demo/spock/pages/UploadSuccessPage.groovy +++ b/integration/geb-testcontainers/src/integration-test/groovy/geb/testcontainers/pages/UploadSuccessPage.groovy @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.demo.spock.pages +package geb.testcontainers.pages import geb.Page diff --git a/integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/ContainerFileDetector.groovy b/integration/geb-testcontainers/src/main/groovy/geb/testcontainers/ContainerFileDetector.groovy similarity index 97% rename from integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/ContainerFileDetector.groovy rename to integration/geb-testcontainers/src/main/groovy/geb/testcontainers/ContainerFileDetector.groovy index f271c209..afbb1ac5 100644 --- a/integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/ContainerFileDetector.groovy +++ b/integration/geb-testcontainers/src/main/groovy/geb/testcontainers/ContainerFileDetector.groovy @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package grails.plugin.geb +package geb.testcontainers import groovy.transform.CompileStatic import org.openqa.selenium.remote.FileDetector diff --git a/integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/ContainerGebConfiguration.groovy b/integration/geb-testcontainers/src/main/groovy/geb/testcontainers/ContainerGebConfiguration.groovy similarity index 91% rename from integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/ContainerGebConfiguration.groovy rename to integration/geb-testcontainers/src/main/groovy/geb/testcontainers/ContainerGebConfiguration.groovy index 0dc4f808..a0b72c4f 100644 --- a/integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/ContainerGebConfiguration.groovy +++ b/integration/geb-testcontainers/src/main/groovy/geb/testcontainers/ContainerGebConfiguration.groovy @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package grails.plugin.geb +package geb.testcontainers import org.testcontainers.containers.GenericContainer @@ -61,11 +61,11 @@ import java.lang.annotation.Target /** * The {@link org.openqa.selenium.remote.FileDetector} implementation to use for this class. * <p> {@link NullContainerFileDetector} results in the - * {@link grails.plugin.geb.serviceloader.ServiceRegistry last set} instance being used. + * {@link geb.testcontainers.serviceloader.ServiceRegistry last set} instance being used. * * @since 4.2 - * @see grails.plugin.geb.DefaultContainerFileDetector DefaultContainerFileDetector - * @see grails.plugin.geb.UselessContainerFileDetector UselessContainerFileDetector + * @see DefaultContainerFileDetector DefaultContainerFileDetector + * @see UselessContainerFileDetector UselessContainerFileDetector */ Class<? extends ContainerFileDetector> fileDetector() default DefaultContainerFileDetector } diff --git a/integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/ContainerGebExtension.groovy b/integration/geb-testcontainers/src/main/groovy/geb/testcontainers/ContainerGebExtension.groovy similarity index 97% rename from integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/ContainerGebExtension.groovy rename to integration/geb-testcontainers/src/main/groovy/geb/testcontainers/ContainerGebExtension.groovy index 02d4eaeb..aac4636f 100644 --- a/integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/ContainerGebExtension.groovy +++ b/integration/geb-testcontainers/src/main/groovy/geb/testcontainers/ContainerGebExtension.groovy @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package grails.plugin.geb +package geb.testcontainers -import grails.plugin.geb.support.LocalhostDownloadSupport +import geb.testcontainers.support.LocalhostDownloadSupport import groovy.transform.CompileStatic import groovy.transform.TailRecursive import groovy.util.logging.Slf4j @@ -32,7 +32,7 @@ import java.time.LocalDateTime /** * A Spock Extension that manages the Testcontainers - * lifecycle for a {@link grails.plugin.geb.ContainerGebSpec}. + * lifecycle for a {@link ContainerGebSpec}. * * <p> ContainerGebSpec cannot be a * {@link geb.test.ManagedGebTest ManagedGebTest} because it would cause the test diff --git a/integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/ContainerGebSpec.groovy b/integration/geb-testcontainers/src/main/groovy/geb/testcontainers/ContainerGebSpec.groovy similarity index 80% rename from integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/ContainerGebSpec.groovy rename to integration/geb-testcontainers/src/main/groovy/geb/testcontainers/ContainerGebSpec.groovy index 4d08d1e3..4b8ef27b 100644 --- a/integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/ContainerGebSpec.groovy +++ b/integration/geb-testcontainers/src/main/groovy/geb/testcontainers/ContainerGebSpec.groovy @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package grails.plugin.geb +package geb.testcontainers import geb.Page import geb.test.GebTestManager -import grails.plugin.geb.support.ContainerSupport -import grails.plugin.geb.support.ReportingSupport -import grails.plugin.geb.support.delegate.BrowserDelegate -import grails.plugin.geb.support.delegate.DownloadSupportDelegate -import grails.plugin.geb.support.delegate.DriverDelegate -import grails.plugin.geb.support.delegate.PageDelegate +import geb.testcontainers.support.ContainerSupport +import geb.testcontainers.support.ReportingSupport +import geb.testcontainers.support.delegate.BrowserDelegate +import geb.testcontainers.support.delegate.DownloadSupportDelegate +import geb.testcontainers.support.delegate.DriverDelegate +import geb.testcontainers.support.delegate.PageDelegate import groovy.transform.CompileStatic import spock.lang.Shared import spock.lang.Specification @@ -42,7 +42,7 @@ import spock.lang.Specification * </li> * </ul> * - * @see grails.plugin.geb.ContainerGebConfiguration for how to customize the container's connection information + * @see ContainerGebConfiguration for how to customize the container's connection information * * @author Søren Berg Glasius * @author Mattias Reichel diff --git a/integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/ContainerGebTestDescription.groovy b/integration/geb-testcontainers/src/main/groovy/geb/testcontainers/ContainerGebTestDescription.groovy similarity index 98% rename from integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/ContainerGebTestDescription.groovy rename to integration/geb-testcontainers/src/main/groovy/geb/testcontainers/ContainerGebTestDescription.groovy index 71251bcd..cf26b047 100644 --- a/integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/ContainerGebTestDescription.groovy +++ b/integration/geb-testcontainers/src/main/groovy/geb/testcontainers/ContainerGebTestDescription.groovy @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package grails.plugin.geb +package geb.testcontainers import groovy.transform.CompileStatic import org.spockframework.runtime.model.IterationInfo diff --git a/integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/DefaultContainerFileDetector.groovy b/integration/geb-testcontainers/src/main/groovy/geb/testcontainers/DefaultContainerFileDetector.groovy similarity index 98% rename from integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/DefaultContainerFileDetector.groovy rename to integration/geb-testcontainers/src/main/groovy/geb/testcontainers/DefaultContainerFileDetector.groovy index c4472a36..040a8277 100644 --- a/integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/DefaultContainerFileDetector.groovy +++ b/integration/geb-testcontainers/src/main/groovy/geb/testcontainers/DefaultContainerFileDetector.groovy @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package grails.plugin.geb +package geb.testcontainers import org.openqa.selenium.remote.LocalFileDetector import org.openqa.selenium.remote.UselessFileDetector diff --git a/integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/GebContainerSettings.groovy b/integration/geb-testcontainers/src/main/groovy/geb/testcontainers/GebContainerSettings.groovy similarity index 99% rename from integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/GebContainerSettings.groovy rename to integration/geb-testcontainers/src/main/groovy/geb/testcontainers/GebContainerSettings.groovy index 6ebc7593..795e683b 100644 --- a/integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/GebContainerSettings.groovy +++ b/integration/geb-testcontainers/src/main/groovy/geb/testcontainers/GebContainerSettings.groovy @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package grails.plugin.geb +package geb.testcontainers import groovy.transform.CompileStatic import groovy.transform.Memoized diff --git a/integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/GebOnFailureReporter.groovy b/integration/geb-testcontainers/src/main/groovy/geb/testcontainers/GebOnFailureReporter.groovy similarity index 95% rename from integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/GebOnFailureReporter.groovy rename to integration/geb-testcontainers/src/main/groovy/geb/testcontainers/GebOnFailureReporter.groovy index d80ed8aa..fd278692 100644 --- a/integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/GebOnFailureReporter.groovy +++ b/integration/geb-testcontainers/src/main/groovy/geb/testcontainers/GebOnFailureReporter.groovy @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package grails.plugin.geb +package geb.testcontainers import groovy.transform.CompileStatic import org.opentest4j.IncompleteExecutionException @@ -25,7 +25,7 @@ import org.spockframework.runtime.extension.IMethodInvocation /** * Adapts {@link geb.spock.OnFailureReporter} for use with - * {@link grails.plugin.geb.ContainerGebSpec}. + * {@link ContainerGebSpec}. */ @CompileStatic class GebOnFailureReporter implements IMethodInterceptor { diff --git a/integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/GebRecordingTestListener.groovy b/integration/geb-testcontainers/src/main/groovy/geb/testcontainers/GebRecordingTestListener.groovy similarity index 99% rename from integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/GebRecordingTestListener.groovy rename to integration/geb-testcontainers/src/main/groovy/geb/testcontainers/GebRecordingTestListener.groovy index 83e040ee..1ba98ddf 100644 --- a/integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/GebRecordingTestListener.groovy +++ b/integration/geb-testcontainers/src/main/groovy/geb/testcontainers/GebRecordingTestListener.groovy @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package grails.plugin.geb +package geb.testcontainers import com.github.dockerjava.api.exception.NotFoundException import groovy.transform.CompileStatic diff --git a/integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/WebDriverContainerHolder.groovy b/integration/geb-testcontainers/src/main/groovy/geb/testcontainers/WebDriverContainerHolder.groovy similarity index 99% rename from integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/WebDriverContainerHolder.groovy rename to integration/geb-testcontainers/src/main/groovy/geb/testcontainers/WebDriverContainerHolder.groovy index b8ba2a05..fab7f18e 100644 --- a/integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/WebDriverContainerHolder.groovy +++ b/integration/geb-testcontainers/src/main/groovy/geb/testcontainers/WebDriverContainerHolder.groovy @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package grails.plugin.geb +package geb.testcontainers import org.openqa.selenium.firefox.FirefoxOptions @@ -50,7 +50,7 @@ import org.testcontainers.containers.VncRecordingContainer import org.testcontainers.images.PullPolicy import org.testcontainers.utility.DockerImageName -import grails.plugin.geb.serviceloader.ServiceRegistry +import geb.testcontainers.serviceloader.ServiceRegistry import static GebContainerSettings.DEFAULT_AT_CHECK_WAITING import static GebContainerSettings.DEFAULT_TIMEOUT_IMPLICITLY_WAIT @@ -59,7 +59,7 @@ import static GebContainerSettings.DEFAULT_TIMEOUT_SCRIPT /** * Responsible for initializing a {@link org.testcontainers.containers.BrowserWebDriverContainer} - * per the Spec's {@link grails.plugin.geb.ContainerGebConfiguration}. This class will try to + * per the Spec's {@link ContainerGebConfiguration}. This class will try to * reuse the same container if the configuration matches the current container. * * @author James Daugherty diff --git a/integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/serviceloader/ServiceRegistry.groovy b/integration/geb-testcontainers/src/main/groovy/geb/testcontainers/serviceloader/ServiceRegistry.groovy similarity index 98% rename from integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/serviceloader/ServiceRegistry.groovy rename to integration/geb-testcontainers/src/main/groovy/geb/testcontainers/serviceloader/ServiceRegistry.groovy index 0d2b15a6..6abb58ab 100644 --- a/integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/serviceloader/ServiceRegistry.groovy +++ b/integration/geb-testcontainers/src/main/groovy/geb/testcontainers/serviceloader/ServiceRegistry.groovy @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package grails.plugin.geb.serviceloader +package geb.testcontainers.serviceloader import groovy.transform.CompileStatic diff --git a/integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/support/BrowserType.groovy b/integration/geb-testcontainers/src/main/groovy/geb/testcontainers/support/BrowserType.groovy similarity index 96% rename from integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/support/BrowserType.groovy rename to integration/geb-testcontainers/src/main/groovy/geb/testcontainers/support/BrowserType.groovy index b6ec9c49..4ab4de73 100644 --- a/integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/support/BrowserType.groovy +++ b/integration/geb-testcontainers/src/main/groovy/geb/testcontainers/support/BrowserType.groovy @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package grails.plugin.geb.support +package geb.testcontainers.support /** * Represents the supported browser types. diff --git a/integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/support/ContainerGebFileInputSource.groovy b/integration/geb-testcontainers/src/main/groovy/geb/testcontainers/support/ContainerGebFileInputSource.groovy similarity index 98% rename from integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/support/ContainerGebFileInputSource.groovy rename to integration/geb-testcontainers/src/main/groovy/geb/testcontainers/support/ContainerGebFileInputSource.groovy index 23c11650..275ab3ea 100644 --- a/integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/support/ContainerGebFileInputSource.groovy +++ b/integration/geb-testcontainers/src/main/groovy/geb/testcontainers/support/ContainerGebFileInputSource.groovy @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package grails.plugin.geb.support +package geb.testcontainers.support /** * A File implementation specifically for assigning to the Geb FileInput module when using ContainerGebSpec. diff --git a/integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/support/ContainerSupport.groovy b/integration/geb-testcontainers/src/main/groovy/geb/testcontainers/support/ContainerSupport.groovy similarity index 97% rename from integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/support/ContainerSupport.groovy rename to integration/geb-testcontainers/src/main/groovy/geb/testcontainers/support/ContainerSupport.groovy index 1af66662..82d53194 100644 --- a/integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/support/ContainerSupport.groovy +++ b/integration/geb-testcontainers/src/main/groovy/geb/testcontainers/support/ContainerSupport.groovy @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package grails.plugin.geb.support +package geb.testcontainers.support import geb.download.DownloadSupport -import grails.plugin.geb.ContainerGebSpec +import geb.testcontainers.ContainerGebSpec import groovy.transform.CompileStatic import groovy.transform.SelfType import org.testcontainers.containers.BrowserWebDriverContainer diff --git a/integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/support/LocalhostDownloadSupport.groovy b/integration/geb-testcontainers/src/main/groovy/geb/testcontainers/support/LocalhostDownloadSupport.groovy similarity index 98% rename from integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/support/LocalhostDownloadSupport.groovy rename to integration/geb-testcontainers/src/main/groovy/geb/testcontainers/support/LocalhostDownloadSupport.groovy index f2167fc9..b517a615 100644 --- a/integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/support/LocalhostDownloadSupport.groovy +++ b/integration/geb-testcontainers/src/main/groovy/geb/testcontainers/support/LocalhostDownloadSupport.groovy @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package grails.plugin.geb.support +package geb.testcontainers.support import geb.Browser import geb.download.DefaultDownloadSupport diff --git a/integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/support/ReportingSupport.groovy b/integration/geb-testcontainers/src/main/groovy/geb/testcontainers/support/ReportingSupport.groovy similarity index 95% rename from integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/support/ReportingSupport.groovy rename to integration/geb-testcontainers/src/main/groovy/geb/testcontainers/support/ReportingSupport.groovy index 4821d490..98267bff 100644 --- a/integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/support/ReportingSupport.groovy +++ b/integration/geb-testcontainers/src/main/groovy/geb/testcontainers/support/ReportingSupport.groovy @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package grails.plugin.geb.support +package geb.testcontainers.support import geb.report.CompositeReporter import geb.report.PageSourceReporter import geb.report.Reporter import geb.report.ScreenshotReporter -import grails.plugin.geb.ContainerGebSpec +import geb.testcontainers.ContainerGebSpec import groovy.transform.CompileStatic import groovy.transform.SelfType diff --git a/integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/support/delegate/BrowserDelegate.groovy b/integration/geb-testcontainers/src/main/groovy/geb/testcontainers/support/delegate/BrowserDelegate.groovy similarity index 99% rename from integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/support/delegate/BrowserDelegate.groovy rename to integration/geb-testcontainers/src/main/groovy/geb/testcontainers/support/delegate/BrowserDelegate.groovy index 4809047c..db4893e0 100644 --- a/integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/support/delegate/BrowserDelegate.groovy +++ b/integration/geb-testcontainers/src/main/groovy/geb/testcontainers/support/delegate/BrowserDelegate.groovy @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package grails.plugin.geb.support.delegate +package geb.testcontainers.support.delegate import geb.Browser import geb.Page import geb.js.JavascriptInterface import geb.url.UrlFragment import geb.webstorage.WebStorage -import grails.plugin.geb.ContainerGebSpec +import geb.testcontainers.ContainerGebSpec import groovy.transform.CompileDynamic import groovy.transform.CompileStatic import groovy.transform.SelfType diff --git a/integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/support/delegate/DownloadSupportDelegate.groovy b/integration/geb-testcontainers/src/main/groovy/geb/testcontainers/support/delegate/DownloadSupportDelegate.groovy similarity index 62% rename from integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/support/delegate/DownloadSupportDelegate.groovy rename to integration/geb-testcontainers/src/main/groovy/geb/testcontainers/support/delegate/DownloadSupportDelegate.groovy index 22f55213..d7740377 100644 --- a/integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/support/delegate/DownloadSupportDelegate.groovy +++ b/integration/geb-testcontainers/src/main/groovy/geb/testcontainers/support/delegate/DownloadSupportDelegate.groovy @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package grails.plugin.geb.support.delegate +package geb.testcontainers.support.delegate import geb.download.DownloadSupport -import grails.plugin.geb.ContainerGebSpec +import geb.testcontainers.ContainerGebSpec import groovy.transform.CompileStatic import groovy.transform.SelfType @@ -38,136 +38,136 @@ trait DownloadSupportDelegate implements DownloadSupport { @Override HttpURLConnection download() { - downloadSupport.download() + ContainerGebSpec.downloadSupport.download() } @Override HttpURLConnection download(Map options) { - downloadSupport.download(options) + ContainerGebSpec.downloadSupport.download(options) } @Override HttpURLConnection download(String uri) { - downloadSupport.download(uri) + ContainerGebSpec.downloadSupport.download(uri) } @Override InputStream downloadStream() { - downloadSupport.downloadStream() + ContainerGebSpec.downloadSupport.downloadStream() } @Override InputStream downloadStream(Map options) { - downloadSupport.downloadStream(options) + ContainerGebSpec.downloadSupport.downloadStream(options) } @Override InputStream downloadStream(Map options, Closure connectionConfig) { - downloadSupport.downloadStream(options, connectionConfig) + ContainerGebSpec.downloadSupport.downloadStream(options, connectionConfig) } @Override InputStream downloadStream(String uri) { - downloadSupport.downloadStream(uri) + ContainerGebSpec.downloadSupport.downloadStream(uri) } @Override InputStream downloadStream(String uri, Closure connectionConfig) { - downloadSupport.downloadStream(uri, connectionConfig) + ContainerGebSpec.downloadSupport.downloadStream(uri, connectionConfig) } @Override InputStream downloadStream(Closure connectionConfig) { - downloadSupport.downloadStream(connectionConfig) + ContainerGebSpec.downloadSupport.downloadStream(connectionConfig) } @Override String downloadText() { - downloadSupport.downloadText() + ContainerGebSpec.downloadSupport.downloadText() } @Override String downloadText(Map options) { - downloadSupport.downloadText(options) + ContainerGebSpec.downloadSupport.downloadText(options) } @Override String downloadText(Map options, Closure connectionConfig) { - downloadSupport.downloadText(options, connectionConfig) + ContainerGebSpec.downloadSupport.downloadText(options, connectionConfig) } @Override String downloadText(String uri) { - downloadSupport.downloadText(uri) + ContainerGebSpec.downloadSupport.downloadText(uri) } @Override String downloadText(String uri, Closure connectionConfig) { - downloadSupport.downloadText(uri, connectionConfig) + ContainerGebSpec.downloadSupport.downloadText(uri, connectionConfig) } @Override String downloadText(Closure connectionConfig) { - downloadSupport.downloadText(connectionConfig) + ContainerGebSpec.downloadSupport.downloadText(connectionConfig) } @Override byte[] downloadBytes() { - downloadSupport.downloadBytes() + ContainerGebSpec.downloadSupport.downloadBytes() } @Override byte[] downloadBytes(Map options) { - downloadSupport.downloadBytes(options) + ContainerGebSpec.downloadSupport.downloadBytes(options) } @Override byte[] downloadBytes(Map options, Closure connectionConfig) { - downloadSupport.downloadBytes(options, connectionConfig) + ContainerGebSpec.downloadSupport.downloadBytes(options, connectionConfig) } @Override byte[] downloadBytes(Closure connectionConfig) { - downloadSupport.downloadBytes(connectionConfig) + ContainerGebSpec.downloadSupport.downloadBytes(connectionConfig) } @Override byte[] downloadBytes(String uri) { - downloadSupport.downloadBytes(uri) + ContainerGebSpec.downloadSupport.downloadBytes(uri) } @Override byte[] downloadBytes(String uri, Closure connectionConfig) { - downloadSupport.downloadBytes(uri, connectionConfig) + ContainerGebSpec.downloadSupport.downloadBytes(uri, connectionConfig) } @Override Object downloadContent() { - downloadSupport.downloadContent() + ContainerGebSpec.downloadSupport.downloadContent() } @Override Object downloadContent(Map options) { - downloadSupport.downloadContent(options) + ContainerGebSpec.downloadSupport.downloadContent(options) } @Override Object downloadContent(Map options, Closure connectionConfig) { - downloadSupport.downloadContent(options, connectionConfig) + ContainerGebSpec.downloadSupport.downloadContent(options, connectionConfig) } @Override Object downloadContent(String uri) { - downloadSupport.downloadContent(uri) + ContainerGebSpec.downloadSupport.downloadContent(uri) } @Override Object downloadContent(String uri, Closure connectionConfig) { - downloadSupport.downloadContent(uri, connectionConfig) + ContainerGebSpec.downloadSupport.downloadContent(uri, connectionConfig) } @Override Object downloadContent(Closure connectionConfig) { - downloadSupport.downloadContent(connectionConfig) + ContainerGebSpec.downloadSupport.downloadContent(connectionConfig) } } \ No newline at end of file diff --git a/integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/support/delegate/DriverDelegate.groovy b/integration/geb-testcontainers/src/main/groovy/geb/testcontainers/support/delegate/DriverDelegate.groovy similarity index 95% rename from integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/support/delegate/DriverDelegate.groovy rename to integration/geb-testcontainers/src/main/groovy/geb/testcontainers/support/delegate/DriverDelegate.groovy index 61e2104d..05af54c0 100644 --- a/integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/support/delegate/DriverDelegate.groovy +++ b/integration/geb-testcontainers/src/main/groovy/geb/testcontainers/support/delegate/DriverDelegate.groovy @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package grails.plugin.geb.support.delegate +package geb.testcontainers.support.delegate -import grails.plugin.geb.ContainerGebSpec +import geb.testcontainers.ContainerGebSpec import groovy.transform.CompileStatic import groovy.transform.SelfType diff --git a/integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/support/delegate/PageDelegate.groovy b/integration/geb-testcontainers/src/main/groovy/geb/testcontainers/support/delegate/PageDelegate.groovy similarity index 99% rename from integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/support/delegate/PageDelegate.groovy rename to integration/geb-testcontainers/src/main/groovy/geb/testcontainers/support/delegate/PageDelegate.groovy index cbd5f259..bafba5cf 100644 --- a/integration/geb-testcontainers/src/main/groovy/grails/plugin/geb/support/delegate/PageDelegate.groovy +++ b/integration/geb-testcontainers/src/main/groovy/geb/testcontainers/support/delegate/PageDelegate.groovy @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package grails.plugin.geb.support.delegate +package geb.testcontainers.support.delegate import geb.Module import geb.Page @@ -30,7 +30,7 @@ import geb.navigator.Navigator import geb.textmatching.TextMatchingSupport import geb.url.UrlFragment import geb.waiting.WaitingSupport -import grails.plugin.geb.ContainerGebSpec +import geb.testcontainers.ContainerGebSpec import groovy.transform.CompileStatic import groovy.transform.SelfType import org.openqa.selenium.By 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 803a0a2f..beedcb82 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.ContainerGebExtension \ No newline at end of file +geb.testcontainers.ContainerGebExtension \ No newline at end of file diff --git a/integration/geb-testcontainers/src/test/groovy/org/demo/spock/BaseUrlConfigSpec.groovy b/integration/geb-testcontainers/src/test/groovy/geb/testcontainers/BaseUrlConfigSpec.groovy similarity index 95% rename from integration/geb-testcontainers/src/test/groovy/org/demo/spock/BaseUrlConfigSpec.groovy rename to integration/geb-testcontainers/src/test/groovy/geb/testcontainers/BaseUrlConfigSpec.groovy index c6b7e5a2..751d5afb 100644 --- a/integration/geb-testcontainers/src/test/groovy/org/demo/spock/BaseUrlConfigSpec.groovy +++ b/integration/geb-testcontainers/src/test/groovy/geb/testcontainers/BaseUrlConfigSpec.groovy @@ -16,9 +16,8 @@ * specific language governing permissions and limitations * under the License. */ -package org.demo.spock +package geb.testcontainers -import grails.plugin.geb.ContainerGebSpec import spock.lang.Narrative /**
