Merge pull request telekom#436 from telekom/fix/local_webdriver_proxy

Fix/local WebDriver proxy
selinanatschke-mms · Aug 7, 2024 · 25e6083 · 25e6083
2 parents 65a8fce + aacbf41
commit 25e6083
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 14 deletions.
diff --git a/build.gradle b/build.gradle
@@ -21,9 +21,9 @@ ext {
     core = project(':core')
     report = project(':report-ng')
 
-    seleniumVersion = '4.21.0'
+    seleniumVersion = '4.23.0'
     // Must be the same like in Selenium 4
-    guavaVersion = "33.0.0-jre"
+    guavaVersion = "33.2.1-jre"
 
     moduleVersion = '2-SNAPSHOT'
     if (System.properties.containsKey('ttVersion')) {

diff --git a/core/src/main/java/eu/tsystems/mms/tic/testframework/utils/ProxyUtils.java b/core/src/main/java/eu/tsystems/mms/tic/testframework/utils/ProxyUtils.java
@@ -59,14 +59,14 @@ private static String getSpecificProxyTypeString(final String proxyType) {
         String proxyString = "";
 
         final String proxyHost = PROPERTY_MANAGER.getProperty(proxyType + ".proxyHost");
-        if (proxyHost != null) {
+        if (StringUtils.isNotBlank(proxyHost)) {
             proxyString += proxyHost;
         } else {
             return null;
         }
 
         final String proxyPort = PROPERTY_MANAGER.getProperty(proxyType + ".proxyPort");
-        if (proxyPort != null) {
+        if (StringUtils.isNotBlank(proxyHost)) {
             proxyString += ":" + proxyPort;
         }
 

diff --git a/docs/src/docs/selenium4/selenium4-cdp.adoc b/docs/src/docs/selenium4/selenium4-cdp.adoc
@@ -170,7 +170,7 @@ public class ChromeDevToolsTests extends TesterraTest implements
 .'Broken' page resources
 [source, java]
 ----
-import org.openqa.selenium.devtools.v125.log.model.LogEntry;
+import org.openqa.selenium.devtools.v127.log.model.LogEntry;
 ...
 
 public class ChromeDevToolsTests extends TesterraTest implements
@@ -211,9 +211,9 @@ public class ChromeDevToolsTests extends TesterraTest implements
 
 [source, java]
 ----
-import org.openqa.selenium.devtools.v125.network.Network;
-import org.openqa.selenium.devtools.v125.network.model.RequestWillBeSent;
-import org.openqa.selenium.devtools.v125.network.model.ResponseReceived;
+import org.openqa.selenium.devtools.v127.network.Network;
+import org.openqa.selenium.devtools.v127.network.model.RequestWillBeSent;
+import org.openqa.selenium.devtools.v127.network.model.ResponseReceived;
 ...
 
 public class ChromeDevToolsTests extends TesterraTest implements

diff --git a/...er-ui/src/main/java/eu/tsystems/mms/tic/testframework/testing/SeleniumChromeDevTools.java b/...er-ui/src/main/java/eu/tsystems/mms/tic/testframework/testing/SeleniumChromeDevTools.java
@@ -28,10 +28,9 @@
 import org.openqa.selenium.chrome.ChromeDriver;
 import org.openqa.selenium.devtools.DevTools;
 import org.openqa.selenium.devtools.HasDevTools;
-
-import org.openqa.selenium.devtools.v125.emulation.Emulation;
-import org.openqa.selenium.devtools.v125.network.Network;
-import org.openqa.selenium.devtools.v125.network.model.Headers;
+import org.openqa.selenium.devtools.v127.emulation.Emulation;
+import org.openqa.selenium.devtools.v127.network.Network;
+import org.openqa.selenium.devtools.v127.network.model.Headers;
 import org.openqa.selenium.remote.Augmenter;
 import org.openqa.selenium.remote.RemoteWebDriver;
 

diff --git a/...src/main/java/eu/tsystems/mms/tic/testframework/webdrivermanager/WebDriverProxyUtils.java b/...src/main/java/eu/tsystems/mms/tic/testframework/webdrivermanager/WebDriverProxyUtils.java
@@ -57,7 +57,7 @@ private String toProxyString(final URL proxyUrl) {
     }
 
     /**
-     * @return Proxy based on an URL including socks proxy settings
+     * @return Proxy based on a URL including socks proxy settings
      */
     public Proxy createSocksProxyFromUrl(URL url) {
         Proxy proxy = createHttpProxyFromUrl(url);
@@ -76,7 +76,7 @@ public Proxy createSocksProxyFromUrl(URL url) {
     }
 
     /**
-     * @return Proxy based on an URL without socks proxy settings
+     * @return Proxy based on a URL without socks proxy settings
      */
     public Proxy createHttpProxyFromUrl(URL url) {
         String proxyString = toProxyString(url);
@@ -103,6 +103,11 @@ public Proxy getDefaultHttpProxy() {
         if (systemProxyUrl == null) {
             systemProxyUrl = ProxyUtils.getSystemHttpProxyUrl();
         }
+        if (systemProxyUrl == null) {
+            Proxy proxy = new Proxy();
+            proxy.setProxyType(Proxy.ProxyType.AUTODETECT);
+            return proxy;
+        }
         Proxy proxy = createHttpProxyFromUrl(systemProxyUrl);
         proxy.setNoProxy(PropertyManager.getProperty("https.nonProxyHosts"));
         return proxy;