use options directly

master
io42630 11 months ago
parent 9a9877c9db
commit 0a551b8fb4

@ -8,7 +8,7 @@
<version>jdk17-0.0</version> <version>jdk17-0.0</version>
</parent> </parent>
<artifactId>tabdriver</artifactId> <artifactId>tabdriver</artifactId>
<version>1.2.2</version> <version>1.2.3</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>tabdriver</name> <name>tabdriver</name>

@ -2,7 +2,6 @@ package com.olexyn.tabdriver;
import org.openqa.selenium.chrome.ChromeOptions; import org.openqa.selenium.chrome.ChromeOptions;
import org.openqa.selenium.remote.CapabilityType; import org.openqa.selenium.remote.CapabilityType;
import org.openqa.selenium.remote.DesiredCapabilities;
import java.util.HashMap; import java.util.HashMap;
@ -10,11 +9,10 @@ public abstract class DefaultTabDriverConfig implements TabDriverConfigProvider
@Override @Override
public DesiredCapabilities getCapabilities() { public ChromeOptions getOptions() {
var cap = DesiredCapabilities.chrome();
cap.setCapability(CapabilityType.ACCEPT_SSL_CERTS, true);
ChromeOptions options = new ChromeOptions(); ChromeOptions options = new ChromeOptions();
options.setCapability(CapabilityType.ACCEPT_SSL_CERTS, true);
options.addArguments("--start-maximized"); options.addArguments("--start-maximized");
if (isHeadless()) { if (isHeadless()) {
options.addArguments("--window-size=1920,1080"); options.addArguments("--window-size=1920,1080");
@ -26,7 +24,6 @@ public abstract class DefaultTabDriverConfig implements TabDriverConfigProvider
chromePrefs.put("download.default_directory", getDownloadDir()); chromePrefs.put("download.default_directory", getDownloadDir());
chromePrefs.put("download.prompt_for_download", false); chromePrefs.put("download.prompt_for_download", false);
options.setExperimentalOption("prefs", chromePrefs); options.setExperimentalOption("prefs", chromePrefs);
cap.setCapability(ChromeOptions.CAPABILITY, options); return options;
return cap;
} }
} }

@ -35,7 +35,8 @@ public class TabDriver implements JavascriptExecutor {
.usingDriverExecutable(path.toFile()) .usingDriverExecutable(path.toFile())
.usingAnyFreePort() .usingAnyFreePort()
.build(); .build();
chromeDriver = new ChromeDriver(service, configProvider.getCapabilities());
chromeDriver = new ChromeDriver(service, configProvider.getOptions());
chromeDriver.manage().timeouts().implicitlyWait(2, TimeUnit.SECONDS); chromeDriver.manage().timeouts().implicitlyWait(2, TimeUnit.SECONDS);
} }

@ -1,6 +1,6 @@
package com.olexyn.tabdriver; package com.olexyn.tabdriver;
import org.openqa.selenium.remote.DesiredCapabilities; import org.openqa.selenium.chrome.ChromeOptions;
import java.nio.file.Path; import java.nio.file.Path;
@ -14,6 +14,6 @@ public interface TabDriverConfigProvider {
boolean isHeadless(); boolean isHeadless();
DesiredCapabilities getCapabilities(); ChromeOptions getOptions();
} }

Loading…
Cancel
Save