Task apache#2016 : remove chromedriver and dynamically load correct one

hansva · Dec 7, 2022 · 3620d10 · 3620d10
1 parent 343a64a
commit 3620d10
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/integration-tests/hopweb/pom.xml b/integration-tests/hopweb/pom.xml
@@ -66,6 +66,11 @@
             <version>1.17.6</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.github.bonigarcia</groupId>
+            <artifactId>webdrivermanager</artifactId>
+            <version>5.3.1</version>
+        </dependency>
     </dependencies>
 
     <reporting>

diff --git a/integration-tests/hopweb/src/test/java/org/apache/hop/ui/hopgui/HopWebTest.java b/integration-tests/hopweb/src/test/java/org/apache/hop/ui/hopgui/HopWebTest.java
@@ -17,6 +17,7 @@
 
 package org.apache.hop.ui.hopgui;
 
+import io.github.bonigarcia.wdm.WebDriverManager;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Order;
@@ -93,9 +94,11 @@ public static void setUp() throws Exception {
         isHeadless = Boolean.valueOf(properties.getProperty("headless"));
         transformsFile = properties.getProperty("transformsFile");
 
-        System.setProperty("webdriver.chrome.driver", driverFile.getAbsolutePath());
         System.setProperty("webdriver.chrome.whitelistedIps", "");
 
+        //Use webDriverManager to fetch correct chromedriver
+        WebDriverManager.chromedriver().setup();
+
         ChromeOptions options = new ChromeOptions();
         if (isHeadless) {
             options.addArguments("headless");

diff --git a/integration-tests/hopweb/src/test/resources/chromedriver b/integration-tests/hopweb/src/test/resources/chromedriver
diff --git a/integration-tests/hopweb/src/test/resources/chromedriver-mac b/integration-tests/hopweb/src/test/resources/chromedriver-mac