Skip to content

Commit 6f88aac

Browse files
committed
Make it easier to use different Selenium images
1 parent 0d925cb commit 6f88aac

File tree

1 file changed

+25
-2
lines changed

1 file changed

+25
-2
lines changed

testcontainers-selenium/src/main/java/software/xdev/testcontainers/selenium/containers/browser/CapabilitiesBrowserWebDriverContainer.java

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,38 @@ public class CapabilitiesBrowserWebDriverContainer<SELF extends CapabilitiesBrow
3737

3838
public CapabilitiesBrowserWebDriverContainer(final Capabilities capabilities)
3939
{
40-
super(getStandardImageForCapabilities(capabilities, SeleniumUtils.getClasspathSeleniumVersion()));
40+
this(capabilities, BROWSER_DOCKER_IMAGES);
41+
}
42+
43+
public CapabilitiesBrowserWebDriverContainer(
44+
final Capabilities capabilities,
45+
final Map<String, DockerImageName> browserDockerImages)
46+
{
47+
this(getStandardImageForCapabilities(
48+
capabilities,
49+
SeleniumUtils.getClasspathSeleniumVersion(),
50+
browserDockerImages));
51+
}
52+
53+
public CapabilitiesBrowserWebDriverContainer(final DockerImageName dockerImageName)
54+
{
55+
super(dockerImageName);
4156
this.waitStrategy = this.getDefaultWaitStrategy();
4257
}
4358

4459
protected static DockerImageName getStandardImageForCapabilities(
4560
final Capabilities capabilities,
4661
final String seleniumVersion)
4762
{
48-
return Optional.ofNullable(BROWSER_DOCKER_IMAGES.get(Optional.ofNullable(capabilities)
63+
return getStandardImageForCapabilities(capabilities, seleniumVersion, BROWSER_DOCKER_IMAGES);
64+
}
65+
66+
protected static DockerImageName getStandardImageForCapabilities(
67+
final Capabilities capabilities,
68+
final String seleniumVersion,
69+
final Map<String, DockerImageName> browserDockerImages)
70+
{
71+
return Optional.ofNullable(browserDockerImages.get(Optional.ofNullable(capabilities)
4972
.map(Capabilities::getBrowserName)
5073
.orElse(BrowserType.CHROME)))
5174
.map(image -> image.withTag(seleniumVersion))

0 commit comments

Comments
 (0)