From 0a551b8fb40812eff536c529201a4a614013fceb Mon Sep 17 00:00:00 2001
From: io42630 <ivan@olexyn.com>
Date: Tue, 14 May 2024 10:47:56 +0200
Subject: [PATCH] use options directly

---
 pom.xml                                                  | 2 +-
 .../com/olexyn/tabdriver/DefaultTabDriverConfig.java     | 9 +++------
 src/main/java/com/olexyn/tabdriver/TabDriver.java        | 3 ++-
 .../com/olexyn/tabdriver/TabDriverConfigProvider.java    | 4 ++--
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index c2d17fe..a18d1c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
 		<version>jdk17-0.0</version>
 	</parent>
 	<artifactId>tabdriver</artifactId>
-	<version>1.2.2</version>
+	<version>1.2.3</version>
 	<packaging>jar</packaging>
 
 	<name>tabdriver</name>
diff --git a/src/main/java/com/olexyn/tabdriver/DefaultTabDriverConfig.java b/src/main/java/com/olexyn/tabdriver/DefaultTabDriverConfig.java
index 5af370e..517934d 100644
--- a/src/main/java/com/olexyn/tabdriver/DefaultTabDriverConfig.java
+++ b/src/main/java/com/olexyn/tabdriver/DefaultTabDriverConfig.java
@@ -2,7 +2,6 @@ package com.olexyn.tabdriver;
 
 import org.openqa.selenium.chrome.ChromeOptions;
 import org.openqa.selenium.remote.CapabilityType;
-import org.openqa.selenium.remote.DesiredCapabilities;
 
 import java.util.HashMap;
 
@@ -10,11 +9,10 @@ public abstract class DefaultTabDriverConfig  implements TabDriverConfigProvider
 
 
     @Override
-    public DesiredCapabilities getCapabilities() {
-        var cap = DesiredCapabilities.chrome();
-        cap.setCapability(CapabilityType.ACCEPT_SSL_CERTS, true);
+    public ChromeOptions getOptions() {
 
         ChromeOptions options = new ChromeOptions();
+        options.setCapability(CapabilityType.ACCEPT_SSL_CERTS, true);
         options.addArguments("--start-maximized");
         if (isHeadless()) {
             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.prompt_for_download", false);
         options.setExperimentalOption("prefs", chromePrefs);
-        cap.setCapability(ChromeOptions.CAPABILITY, options);
-        return cap;
+        return options;
     }
 }
diff --git a/src/main/java/com/olexyn/tabdriver/TabDriver.java b/src/main/java/com/olexyn/tabdriver/TabDriver.java
index 03e8fed..1d059dc 100644
--- a/src/main/java/com/olexyn/tabdriver/TabDriver.java
+++ b/src/main/java/com/olexyn/tabdriver/TabDriver.java
@@ -35,7 +35,8 @@ public class TabDriver implements JavascriptExecutor {
             .usingDriverExecutable(path.toFile())
             .usingAnyFreePort()
             .build();
-        chromeDriver = new ChromeDriver(service, configProvider.getCapabilities());
+
+        chromeDriver = new ChromeDriver(service, configProvider.getOptions());
         chromeDriver.manage().timeouts().implicitlyWait(2, TimeUnit.SECONDS);
     }
 
diff --git a/src/main/java/com/olexyn/tabdriver/TabDriverConfigProvider.java b/src/main/java/com/olexyn/tabdriver/TabDriverConfigProvider.java
index 038ad9f..86ae01a 100644
--- a/src/main/java/com/olexyn/tabdriver/TabDriverConfigProvider.java
+++ b/src/main/java/com/olexyn/tabdriver/TabDriverConfigProvider.java
@@ -1,6 +1,6 @@
 package com.olexyn.tabdriver;
 
-import org.openqa.selenium.remote.DesiredCapabilities;
+import org.openqa.selenium.chrome.ChromeOptions;
 
 import java.nio.file.Path;
 
@@ -14,6 +14,6 @@ public interface TabDriverConfigProvider {
 
     boolean isHeadless();
 
-    DesiredCapabilities getCapabilities();
+    ChromeOptions getOptions();
 
 }