Skip to content

Commit d758075

Browse files
nicolasiltisadmin
authored andcommitted
add htmlunit dependence
Since htmlunit isn't in the selenium project we have to add it manually in the build.gradle. (SeleniumHQ/selenium@05325a7#diff-1998ab834c50706eec2893da4561cc50)
1 parent 7e17d56 commit d758075

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ dependencies {
117117
testCompile 'org.hamcrest:hamcrest-all:1.3'
118118
testCompile ('org.seleniumhq.selenium:selenium-java:3.12.0') { exclude group: 'junit' }
119119
testCompile 'org.seleniumhq.selenium:selenium-api:3.12.0'
120+
testCompile 'org.seleniumhq.selenium:htmlunit-driver:2.29.0'
120121
testCompile 'log4j:log4j:1.2.17'
121122
testCompile 'args4j:args4j:2.0.16'
122123
testCompile 'commons-configuration:commons-configuration:1.8'

src/test/java/net/continuumsecurity/scanner/ZapManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public int startZAP(String zapPath) throws Exception {
4848
params.add("-config"); params.add("api.key="+API_KEY);
4949
Config.getInstance().setProxyApi(API_KEY);
5050
String upstreamProxyHost = Config.getInstance().getUpstreamProxyHost();
51-
if (upstreamProxyHost.isEmpty()) {
51+
if (!upstreamProxyHost.isEmpty()) {
5252
int upstreamProxyPort = Config.getInstance().getUpstreamProxyPort();
5353
log.info("Setting upstream proxy for ZAP to: "+upstreamProxyHost+":"+upstreamProxyPort);
5454
params.add("-config"); params.add("connection.proxyChain.hostName="+upstreamProxyHost);

src/test/java/net/continuumsecurity/web/drivers/DriverFactory.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import org.openqa.selenium.firefox.internal.ProfilesIni;
3030
import org.openqa.selenium.remote.CapabilityType;
3131
import org.openqa.selenium.remote.DesiredCapabilities;
32+
import org.openqa.selenium.htmlunit.HtmlUnitDriver;
3233

3334
import java.io.File;
3435

@@ -170,7 +171,8 @@ public DesiredCapabilities createProxyCapabilities(String type) {
170171
capabilities = DesiredCapabilities.firefox();
171172
break;
172173
case HTMLUNIT:
173-
capabilities = DesiredCapabilities.htmlunit();
174+
capabilities = DesiredCapabilities.htmlUnit();
175+
break;
174176
default:
175177
break;
176178
}

0 commit comments

Comments
 (0)