From d7580754bab46ccc28d046bbc2391347b12adba6 Mon Sep 17 00:00:00 2001 From: nicolasiltis Date: Tue, 22 May 2018 14:36:21 +0200 Subject: [PATCH] add htmlunit dependence Since htmlunit isn't in the selenium project we have to add it manually in the build.gradle. (https://github.com/SeleniumHQ/selenium/commit/05325a7c1ebf59e838120b789ab0739f48e50344#diff-1998ab834c50706eec2893da4561cc50) --- build.gradle | 1 + src/test/java/net/continuumsecurity/scanner/ZapManager.java | 2 +- .../java/net/continuumsecurity/web/drivers/DriverFactory.java | 4 +++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 770d1bcf..f01ac8f0 100644 --- a/build.gradle +++ b/build.gradle @@ -117,6 +117,7 @@ dependencies { testCompile 'org.hamcrest:hamcrest-all:1.3' testCompile ('org.seleniumhq.selenium:selenium-java:3.12.0') { exclude group: 'junit' } testCompile 'org.seleniumhq.selenium:selenium-api:3.12.0' + testCompile 'org.seleniumhq.selenium:htmlunit-driver:2.29.0' testCompile 'log4j:log4j:1.2.17' testCompile 'args4j:args4j:2.0.16' testCompile 'commons-configuration:commons-configuration:1.8' diff --git a/src/test/java/net/continuumsecurity/scanner/ZapManager.java b/src/test/java/net/continuumsecurity/scanner/ZapManager.java index c5ca17b0..ef73f065 100644 --- a/src/test/java/net/continuumsecurity/scanner/ZapManager.java +++ b/src/test/java/net/continuumsecurity/scanner/ZapManager.java @@ -48,7 +48,7 @@ public int startZAP(String zapPath) throws Exception { params.add("-config"); params.add("api.key="+API_KEY); Config.getInstance().setProxyApi(API_KEY); String upstreamProxyHost = Config.getInstance().getUpstreamProxyHost(); - if (upstreamProxyHost.isEmpty()) { + if (!upstreamProxyHost.isEmpty()) { int upstreamProxyPort = Config.getInstance().getUpstreamProxyPort(); log.info("Setting upstream proxy for ZAP to: "+upstreamProxyHost+":"+upstreamProxyPort); params.add("-config"); params.add("connection.proxyChain.hostName="+upstreamProxyHost); diff --git a/src/test/java/net/continuumsecurity/web/drivers/DriverFactory.java b/src/test/java/net/continuumsecurity/web/drivers/DriverFactory.java index 8eb87d03..e1ab05d1 100644 --- a/src/test/java/net/continuumsecurity/web/drivers/DriverFactory.java +++ b/src/test/java/net/continuumsecurity/web/drivers/DriverFactory.java @@ -29,6 +29,7 @@ import org.openqa.selenium.firefox.internal.ProfilesIni; import org.openqa.selenium.remote.CapabilityType; import org.openqa.selenium.remote.DesiredCapabilities; +import org.openqa.selenium.htmlunit.HtmlUnitDriver; import java.io.File; @@ -170,7 +171,8 @@ public DesiredCapabilities createProxyCapabilities(String type) { capabilities = DesiredCapabilities.firefox(); break; case HTMLUNIT: - capabilities = DesiredCapabilities.htmlunit(); + capabilities = DesiredCapabilities.htmlUnit(); + break; default: break; }