Skip to content

Commit 22d6ed2

Browse files
rbrirbri
committed
use webdriver 4.10.0
1 parent ef85ce3 commit 22d6ed2

File tree

3 files changed

+63
-61
lines changed

3 files changed

+63
-61
lines changed

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>org.seleniumhq.selenium</groupId>
77
<artifactId>htmlunit3-driver</artifactId>
8-
<version>4.9.1</version>
8+
<version>4.10.0-SNAPSHOT</version>
99

1010
<name>htmlunit-driver</name>
1111
<description>WebDriver compatible driver for HtmlUnit headless browser</description>
@@ -18,7 +18,7 @@
1818
<maven.compiler.source>8</maven.compiler.source>
1919
<maven.compiler.target>8</maven.compiler.target>
2020

21-
<selenium.version>4.9.1</selenium.version>
21+
<selenium.version>4.10.0</selenium.version>
2222
<htmlunit.version>3.2.0</htmlunit.version>
2323

2424
<jetty.version>9.4.51.v20230217</jetty.version>

‎src/main/java/org/openqa/selenium/htmlunit/HtmlUnitDriver.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -607,8 +607,9 @@ public Capabilities getCapabilities() {
607607
final DesiredCapabilities capabilities = new DesiredCapabilities(HTMLUNIT.browserName(), "", Platform.ANY);
608608

609609
capabilities.setPlatform(Platform.getCurrent());
610-
capabilities.setJavascriptEnabled(isJavascriptEnabled());
611610
capabilities.setVersion(Version.getProductVersion());
611+
612+
capabilities.setCapability(HtmlUnitDriver.JAVASCRIPT_ENABLED, isJavascriptEnabled());
612613
return capabilities;
613614
}
614615

‎src/test/java/org/openqa/selenium/htmlunit/HtmlUnitDriverTest.java‎

Lines changed: 59 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -242,48 +242,6 @@ protected WebClient modifyWebClient(final WebClient client) {
242242
};
243243
}
244244

245-
@Test
246-
public void ctorWebClientCapabilitiesJsTrue() {
247-
final DesiredCapabilities capabilities =
248-
new DesiredCapabilities(Browser.HTMLUNIT.browserName(), "", Platform.ANY);
249-
capabilities.setCapability(CapabilityType.SUPPORTS_JAVASCRIPT, true);
250-
251-
new HtmlUnitDriver(capabilities) {
252-
@Override
253-
protected WebClient modifyWebClient(final WebClient client) {
254-
assertEquals(BrowserVersion.getDefault(), client.getBrowserVersion());
255-
256-
assertTrue("client.getOptions().isJavaScriptEnabled() is false",
257-
client.getOptions().isJavaScriptEnabled());
258-
assertTrue("client.isJavaScriptEnabled() is false", client.isJavaScriptEnabled());
259-
assertTrue("client.isJavaScriptEngineEnabled() is false", client.isJavaScriptEngineEnabled());
260-
261-
return client;
262-
}
263-
};
264-
}
265-
266-
@Test
267-
public void ctorWebClientCapabilitiesJsFalse() {
268-
final DesiredCapabilities capabilities =
269-
new DesiredCapabilities(Browser.HTMLUNIT.browserName(), "", Platform.ANY);
270-
capabilities.setCapability(CapabilityType.SUPPORTS_JAVASCRIPT, false);
271-
272-
new HtmlUnitDriver(capabilities) {
273-
@Override
274-
protected WebClient modifyWebClient(final WebClient client) {
275-
assertEquals(BrowserVersion.getDefault(), client.getBrowserVersion());
276-
277-
assertFalse("client.getOptions().isJavaScriptEnabled() is true",
278-
client.getOptions().isJavaScriptEnabled());
279-
assertFalse("client.isJavaScriptEnabled() is true", client.isJavaScriptEnabled());
280-
assertTrue("client.isJavaScriptEngineEnabled() is false", client.isJavaScriptEngineEnabled());
281-
282-
return client;
283-
}
284-
};
285-
}
286-
287245
@Test
288246
public void ctorWebClientCapabilitiesVersionString() {
289247
DesiredCapabilities capabilities = new DesiredCapabilities(Browser.HTMLUNIT.browserName(), "firefox",
@@ -449,10 +407,56 @@ protected WebClient modifyWebClient(final WebClient client) {
449407
}
450408

451409
@Test
452-
public void ctorWebClientCapabilitiesJsEnabledTrue() {
410+
public void ctorWebClientJsEnabledTrue() {
453411
final DesiredCapabilities capabilities =
454412
new DesiredCapabilities(Browser.HTMLUNIT.browserName(), "", Platform.ANY);
455-
capabilities.setJavascriptEnabled(true);
413+
414+
final HtmlUnitDriver driver = new HtmlUnitDriver(capabilities);
415+
assertTrue("client.getOptions().isJavaScriptEnabled() is false", driver.isJavascriptEnabled());
416+
assertTrue("client.getOptions().isJavaScriptEnabled() is true",
417+
driver.getWebClient().getOptions().isJavaScriptEnabled());
418+
assertTrue("client.isJavaScriptEnabled() is true", driver.getWebClient().isJavaScriptEnabled());
419+
assertTrue("client.isJavaScriptEngineEnabled() is false", driver.getWebClient().isJavaScriptEngineEnabled());
420+
421+
driver.setJavascriptEnabled(false);
422+
assertFalse("client.getOptions().isJavaScriptEnabled() is true", driver.isJavascriptEnabled());
423+
assertFalse("client.getOptions().isJavaScriptEnabled() is true",
424+
driver.getWebClient().getOptions().isJavaScriptEnabled());
425+
assertFalse("client.isJavaScriptEnabled() is true", driver.getWebClient().isJavaScriptEnabled());
426+
assertTrue("client.isJavaScriptEngineEnabled() is false", driver.getWebClient().isJavaScriptEngineEnabled());
427+
}
428+
429+
@Test
430+
public void ctorWebClientJsEnabledFalse() {
431+
final DesiredCapabilities capabilities =
432+
new DesiredCapabilities(Browser.HTMLUNIT.browserName(), "", Platform.ANY);
433+
434+
final HtmlUnitDriver driver = new HtmlUnitDriver(capabilities) {
435+
@Override
436+
protected WebClient modifyWebClient(final WebClient client) {
437+
assertEquals(BrowserVersion.getDefault(), client.getBrowserVersion());
438+
439+
client.getOptions().setJavaScriptEnabled(false);
440+
441+
return client;
442+
}
443+
};
444+
445+
assertFalse("client.getOptions().isJavaScriptEnabled() is true", driver.isJavascriptEnabled());
446+
assertFalse("client.getOptions().isJavaScriptEnabled() is true",
447+
driver.getWebClient().getOptions().isJavaScriptEnabled());
448+
assertFalse("client.isJavaScriptEnabled() is true", driver.getWebClient().isJavaScriptEnabled());
449+
assertTrue("client.isJavaScriptEngineEnabled() is false", driver.getWebClient().isJavaScriptEngineEnabled());
450+
}
451+
452+
@Test
453+
public void ctorWebClientCapabilitiesProxy() {
454+
final Proxy proxy = new Proxy();
455+
proxy.setHttpProxy("hostname:1234");
456+
457+
final DesiredCapabilities capabilities =
458+
new DesiredCapabilities(Browser.HTMLUNIT.browserName(), "", Platform.ANY);
459+
capabilities.setCapability(CapabilityType.PROXY, proxy);
456460

457461
new HtmlUnitDriver(capabilities) {
458462
@Override
@@ -464,25 +468,28 @@ protected WebClient modifyWebClient(final WebClient client) {
464468
assertTrue("client.isJavaScriptEnabled() is false", client.isJavaScriptEnabled());
465469
assertTrue("client.isJavaScriptEngineEnabled() is false", client.isJavaScriptEngineEnabled());
466470

471+
assertEquals("hostname", client.getOptions().getProxyConfig().getProxyHost());
472+
assertEquals(1234, client.getOptions().getProxyConfig().getProxyPort());
473+
467474
return client;
468475
}
469476
};
470477
}
471478

472479
@Test
473-
public void ctorWebClientCapabilitiesJsEnabledFalse() {
480+
public void ctorWebClientCapabilitiesJsTrue() {
474481
final DesiredCapabilities capabilities =
475482
new DesiredCapabilities(Browser.HTMLUNIT.browserName(), "", Platform.ANY);
476-
capabilities.setJavascriptEnabled(false);
483+
capabilities.setCapability(HtmlUnitDriver.JAVASCRIPT_ENABLED, true);
477484

478485
new HtmlUnitDriver(capabilities) {
479486
@Override
480487
protected WebClient modifyWebClient(final WebClient client) {
481488
assertEquals(BrowserVersion.getDefault(), client.getBrowserVersion());
482489

483-
assertFalse("client.getOptions().isJavaScriptEnabled() is true",
490+
assertTrue("client.getOptions().isJavaScriptEnabled() is false",
484491
client.getOptions().isJavaScriptEnabled());
485-
assertFalse("client.isJavaScriptEnabled() is true", client.isJavaScriptEnabled());
492+
assertTrue("client.isJavaScriptEnabled() is false", client.isJavaScriptEnabled());
486493
assertTrue("client.isJavaScriptEngineEnabled() is false", client.isJavaScriptEngineEnabled());
487494

488495
return client;
@@ -491,27 +498,21 @@ protected WebClient modifyWebClient(final WebClient client) {
491498
}
492499

493500
@Test
494-
public void ctorWebClientCapabilitiesProxy() {
495-
final Proxy proxy = new Proxy();
496-
proxy.setHttpProxy("hostname:1234");
497-
501+
public void ctorWebClientCapabilitiesJsFalse() {
498502
final DesiredCapabilities capabilities =
499503
new DesiredCapabilities(Browser.HTMLUNIT.browserName(), "", Platform.ANY);
500-
capabilities.setCapability(CapabilityType.PROXY, proxy);
504+
capabilities.setCapability(HtmlUnitDriver.JAVASCRIPT_ENABLED, false);
501505

502506
new HtmlUnitDriver(capabilities) {
503507
@Override
504508
protected WebClient modifyWebClient(final WebClient client) {
505509
assertEquals(BrowserVersion.getDefault(), client.getBrowserVersion());
506510

507-
assertTrue("client.getOptions().isJavaScriptEnabled() is false",
511+
assertFalse("client.getOptions().isJavaScriptEnabled() is true",
508512
client.getOptions().isJavaScriptEnabled());
509-
assertTrue("client.isJavaScriptEnabled() is false", client.isJavaScriptEnabled());
513+
assertFalse("client.isJavaScriptEnabled() is true", client.isJavaScriptEnabled());
510514
assertTrue("client.isJavaScriptEngineEnabled() is false", client.isJavaScriptEngineEnabled());
511515

512-
assertEquals("hostname", client.getOptions().getProxyConfig().getProxyHost());
513-
assertEquals(1234, client.getOptions().getProxyConfig().getProxyPort());
514-
515516
return client;
516517
}
517518
};

0 commit comments

Comments
 (0)