-
-
Notifications
You must be signed in to change notification settings - Fork 1.8k
VNC recording with BrowserWebdriverContainer in Spock-Extension #2548
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
8dde04a
WIP for VNC recording with BrowserWebdriverContainer in Spock-Extension
kiview 43a5148
Update to current interfaces and module structure
kiview c662c37
Use TestLifecycleAware interface
kiview 98d947e
Use TestLifecycleAware methods
kiview 1a995de
Use correct filenames for TestDescription
kiview 385a3a5
URL encode spec and feature name, private ErrorListener
kiview 068452c
Merge branch 'master' into spock-vnc-recording
kiview f3bd659
Merge branch 'master' into spock-vnc-recording
kiview fd34121
Merge branch 'master' into spock-vnc-recording
kiview ba0050b
Merge branch 'master' into spock-vnc-recording
kiview 8a5cc8d
Use filesystemFriendlyName as testId in SpockTestDescription
kiview 59c1ac6
Use data-driven test in BrowserVncRecordingIT
kiview c161382
Merge branch 'master' into spock-vnc-recording
kiview File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
36 changes: 36 additions & 0 deletions
36
modules/spock/src/main/groovy/org/testcontainers/spock/SpockTestDescription.groovy
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| package org.testcontainers.spock | ||
|
|
||
| import groovy.transform.PackageScope | ||
| import org.spockframework.runtime.extension.IMethodInvocation | ||
| import org.testcontainers.lifecycle.TestDescription | ||
|
|
||
| /** | ||
| * Spock specific implementation of a Testcontainers TestDescription. | ||
| * | ||
| * Filesystem friendly name is based on Specification and Feature. | ||
| */ | ||
| @PackageScope | ||
| class SpockTestDescription implements TestDescription { | ||
|
|
||
| String specName | ||
| String featureName | ||
|
|
||
| static SpockTestDescription fromTestDescription(IMethodInvocation invocation) { | ||
| return new SpockTestDescription([ | ||
| specName: invocation.spec.name, | ||
| featureName: invocation.feature.name | ||
| ]) | ||
| } | ||
|
|
||
| @Override | ||
| String getTestId() { | ||
| return getFilesystemFriendlyName() | ||
| } | ||
|
|
||
| @Override | ||
| String getFilesystemFriendlyName() { | ||
| return [specName, featureName].collect { | ||
kiview marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| URLEncoder.encode(it, 'UTF-8') | ||
| }.join('-') | ||
| } | ||
| } | ||
17 changes: 16 additions & 1 deletion
17
modules/spock/src/main/groovy/org/testcontainers/spock/TestcontainersExtension.groovy
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,32 @@ | ||
| package org.testcontainers.spock | ||
|
|
||
| import org.spockframework.runtime.AbstractRunListener | ||
| import org.spockframework.runtime.extension.AbstractAnnotationDrivenExtension | ||
| import org.spockframework.runtime.model.ErrorInfo | ||
| import org.spockframework.runtime.model.SpecInfo | ||
|
|
||
| class TestcontainersExtension extends AbstractAnnotationDrivenExtension<Testcontainers> { | ||
|
|
||
| @Override | ||
| void visitSpecAnnotation(Testcontainers annotation, SpecInfo spec) { | ||
| def interceptor = new TestcontainersMethodInterceptor(spec) | ||
| def listener = new ErrorListener() | ||
| def interceptor = new TestcontainersMethodInterceptor(spec, listener) | ||
| spec.addSetupSpecInterceptor(interceptor) | ||
| spec.addCleanupSpecInterceptor(interceptor) | ||
| spec.addSetupInterceptor(interceptor) | ||
| spec.addCleanupInterceptor(interceptor) | ||
|
|
||
| spec.addListener(listener) | ||
|
|
||
| } | ||
|
|
||
| private class ErrorListener extends AbstractRunListener { | ||
| List<ErrorInfo> errors = [] | ||
|
|
||
| @Override | ||
| void error(ErrorInfo error) { | ||
| errors.add(error) | ||
| } | ||
| } | ||
|
|
||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
88 changes: 88 additions & 0 deletions
88
modules/spock/src/test/groovy/org/testcontainers/spock/BrowserVncRecordingIT.groovy
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| package org.testcontainers.spock | ||
|
|
||
| import org.intellij.lang.annotations.Language | ||
| import org.junit.Rule | ||
| import org.junit.rules.TemporaryFolder | ||
| import spock.lang.Specification | ||
| import spock.lang.Unroll | ||
| import spock.util.EmbeddedSpecRunner | ||
|
|
||
| import static org.testcontainers.containers.BrowserWebDriverContainer.VncRecordingMode.RECORD_ALL | ||
| import static org.testcontainers.containers.BrowserWebDriverContainer.VncRecordingMode.RECORD_FAILING | ||
|
|
||
| class BrowserVncRecordingIT extends Specification { | ||
|
|
||
| @Rule | ||
| TemporaryFolder temp | ||
|
|
||
| String recordingDir | ||
|
|
||
| def setup() { | ||
| recordingDir = temp.getRoot().getAbsolutePath() | ||
| } | ||
|
|
||
| @Unroll("For recording mode #recordingMode and failing test is #fails records video file named '#videoFileName'") | ||
| def "retains all recordings for RECORD_ALL if successful"() { | ||
bsideup marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| given: | ||
|
|
||
| //noinspection GrPackage | ||
| @Language("groovy") | ||
kiview marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| String myTest = """ | ||
| package org.testcontainers.spock | ||
|
|
||
| import org.openqa.selenium.chrome.ChromeOptions | ||
| import org.openqa.selenium.remote.RemoteWebDriver | ||
| import org.testcontainers.containers.BrowserWebDriverContainer | ||
| import spock.lang.Specification | ||
|
|
||
| import java.util.concurrent.TimeUnit | ||
|
|
||
| import static org.testcontainers.containers.BrowserWebDriverContainer.VncRecordingMode | ||
|
|
||
| @Testcontainers | ||
| class BrowserWebdriverContainerIT extends Specification { | ||
|
|
||
| BrowserWebDriverContainer browserContainer = new BrowserWebDriverContainer() | ||
| .withCapabilities(new ChromeOptions()) | ||
| .withRecordingMode("$recordingMode" as VncRecordingMode, new File("$recordingDir")) | ||
|
|
||
| RemoteWebDriver driver | ||
|
|
||
| def setup() { | ||
| driver = browserContainer.getWebDriver() | ||
| driver.manage().timeouts().implicitlyWait(30, TimeUnit.SECONDS) | ||
| } | ||
|
|
||
| def "should record"() { | ||
| when: | ||
| driver.get("http://en.wikipedia.org/wiki/Randomness") | ||
|
|
||
| then: | ||
| driver.findElementByPartialLinkText("pattern").isDisplayed() == !$fails | ||
| } | ||
|
|
||
| } | ||
|
|
||
|
|
||
| """ | ||
|
|
||
| when: | ||
| EmbeddedSpecRunner runner = new EmbeddedSpecRunner(throwFailure: false) | ||
| runner.run(myTest) | ||
|
|
||
| then: | ||
| def videoDir = temp.getRoot().list() | ||
| if (videoFileName.isEmpty()) { | ||
| videoDir.length == 0 | ||
| } else { | ||
| videoDir.find { it.contains(videoFileName) } | ||
| } | ||
|
|
||
| where: | ||
| recordingMode | fails | videoFileName | ||
| RECORD_ALL | false | 'BrowserWebdriverContainerIT-should+record' | ||
| RECORD_FAILING | false | '' | ||
| RECORD_FAILING | true | 'BrowserWebdriverContainerIT-should+record' | ||
| } | ||
|
|
||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.