#144 - Remove support for ftp proxy

Xceptance · Sep 28, 2020 · d612858 · d612858
1 parent 4c9c357
commit d612858
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/config/browser.properties b/config/browser.properties
@@ -101,14 +101,14 @@ browserprofile.Chrome_headless.name = Headless Google Chrome 1024x768
 browserprofile.Chrome_headless.browser = chrome
 browserprofile.Chrome_headless.browserResolution = 1024x768
 browserprofile.Chrome_headless.arguments = -ignore-certificate-errors
-browserprofile.Chrome_headless.headless =  true
+browserprofile.Chrome_headless.headless = true
 
 # Local headless Chrome
 browserprofile.Chrome_1500x1000_headless.name = Headless Google Chrome 1500x1000
 browserprofile.Chrome_1500x1000_headless.browser = chrome
 browserprofile.Chrome_1500x1000_headless.browserResolution = 1500x1000
 browserprofile.Chrome_1500x1000_headless.arguments = -ignore-certificate-errors
-browserprofile.Chrome_1500x1000_headless.headless =  true
+browserprofile.Chrome_1500x1000_headless.headless = true
 
 # Small Firefox
 browserprofile.FF_1024x768.name = Firefox 1024x768

diff --git a/...va/com/xceptance/neodymium/module/statement/browser/multibrowser/BrowserRunnerHelper.java b/...va/com/xceptance/neodymium/module/statement/browser/multibrowser/BrowserRunnerHelper.java
@@ -353,7 +353,6 @@ public static Proxy createProxyCapabilities()
         final Proxy webdriverProxy = new Proxy();
         webdriverProxy.setHttpProxy(proxyHost);
         webdriverProxy.setSslProxy(proxyHost);
-        webdriverProxy.setFtpProxy(proxyHost);
         if (!StringUtils.isAllEmpty(Neodymium.configuration().getProxySocketUsername(), Neodymium.configuration().getProxySocketPassword())
             || Neodymium.configuration().getProxySocketVersion() != null)
         {

diff --git a/src/test/java/com/xceptance/neodymium/testclasses/proxy/RunWithProxy.java b/src/test/java/com/xceptance/neodymium/testclasses/proxy/RunWithProxy.java
@@ -6,9 +6,9 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.openqa.selenium.WebDriverException;
 
 import com.codeborne.selenide.Selenide;
-import com.codeborne.selenide.ex.ElementNotFound;
 import com.xceptance.neodymium.NeodymiumRunner;
 import com.xceptance.neodymium.module.statement.browser.multibrowser.Browser;
 
@@ -20,9 +20,8 @@ public class RunWithProxy
     @Test
     public void testProxyConfiguration()
     {
-        Selenide.open("https://www.xceptance.de");
-        Assert.assertThrows(ElementNotFound.class, () -> {
-            $("#page #navigation").shouldBe(visible);
+        Assert.assertThrows(WebDriverException.class, () -> {
+            Selenide.open("https://github.com/Xceptance/neodymium-library/");
         });
     }
 

diff --git a/src/test/java/com/xceptance/neodymium/tests/ProxyConfigurationTest.java b/src/test/java/com/xceptance/neodymium/tests/ProxyConfigurationTest.java
@@ -19,7 +19,7 @@ public class ProxyConfigurationTest extends NeodymiumTest
 {
     private static final String HOST = "bemylittleproxydarling.se";
 
-    private static final String PORT = "0815";
+    private static final String PORT = "1323";
 
     private static final String BYPASS = "www.xceptance.com";