Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Selenium: Restore getDockerImageForCapabilities method to public scope #3441

Merged
merged 1 commit into from
Nov 8, 2020
Merged

Selenium: Restore getDockerImageForCapabilities method to public scope #3441

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ protected void configure() {
customImageName.assertCompatibleWith(COMPATIBLE_IMAGES);
super.setDockerImageName(customImageName.asCanonicalNameString());
} else {
DockerImageName standardImageForCapabilities = getImageForCapabilities(capabilities, seleniumVersion);
DockerImageName standardImageForCapabilities = getStandardImageForCapabilities(capabilities, seleniumVersion);
super.setDockerImageName(standardImageForCapabilities.asCanonicalNameString());
}

Expand Down Expand Up @@ -218,7 +218,22 @@ protected void configure() {
setStartupAttempts(3);
}

private static DockerImageName getImageForCapabilities(Capabilities capabilities, String seleniumVersion) {
/**
* @param capabilities a {@link Capabilities} object for either Chrome or Firefox
* @param seleniumVersion the version of selenium in use
* @return an image name for the default standalone Docker image for the appropriate browser
*
* @deprecated note that this method is deprecated and may be removed in the future. The no-args
* {@link BrowserWebDriverContainer#BrowserWebDriverContainer()} combined with the
* {@link BrowserWebDriverContainer#withCapabilities(Capabilities)} method should be considered. A decision on
* removal of this deprecated method will be taken at a future date.
*/
@Deprecated
public static String getDockerImageForCapabilities(Capabilities capabilities, String seleniumVersion) {
return getStandardImageForCapabilities(capabilities, seleniumVersion).asCanonicalNameString();
}

private static DockerImageName getStandardImageForCapabilities(Capabilities capabilities, String seleniumVersion) {
String browserName = capabilities.getBrowserName();
switch (browserName) {
case BrowserType.CHROME:
Expand Down