Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump HTMLUnit version from 2.31 to 2.36.0 #179

Closed
wants to merge 2 commits into from
Closed

Bump HTMLUnit version from 2.31 to 2.36.0 #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
983c45f
Bump HTMLUnit version from 2.31 to 2.36.0.
uhafner Nov 7, 2019
fbc69cb
Implement missing warn method in JavaScriptErrorListener.
uhafner Nov 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ THE SOFTWARE.
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jetty.version>9.4.5.v20170502</jetty.version>
<hamcrest.version>2.2</hamcrest.version>
<htmlunit.version>2.36.0-1</htmlunit.version>
<java.level>8</java.level>
<concurrency>1</concurrency> <!-- may use e.g. 2C for 2 × (number of cores) -->
<!--TODO: fix FindBugs-->
Expand Down Expand Up @@ -129,7 +130,7 @@ THE SOFTWARE.
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jenkins-test-harness-htmlunit</artifactId>
<version>2.31-2</version>
<version>${htmlunit.version}</version>
<exclusions>
<exclusion>
<groupId>commons-io</groupId>
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/com/gargoylesoftware/htmlunit/WebClientUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,5 +136,9 @@ public void malformedScriptURL(HtmlPage htmlPage, String url, MalformedURLExcept
@Override
public void loadScriptError(HtmlPage htmlPage, URL scriptUrl, Exception exception) {
}

@Override
public void warn(String message, String sourceName, int line, String lineSource, int lineOffset) {
}
}
}
4 changes: 2 additions & 2 deletions src/main/java/com/gargoylesoftware/htmlunit/html/DomNodeUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
package com.gargoylesoftware.htmlunit.html;

import com.gargoylesoftware.htmlunit.WebClientUtil;
import com.gargoylesoftware.htmlunit.html.xpath.XPathUtils;
import com.gargoylesoftware.htmlunit.html.xpath.XPathHelper;

import java.util.List;

Expand All @@ -47,7 +47,7 @@ public class DomNodeUtil {
*/
public static <E> List<E> selectNodes(final DomNode domNode, final String xpathExpr) {
WebClientUtil.waitForJSExec(domNode.getPage().getWebClient());
return (List) XPathUtils.getByXPath(domNode, xpathExpr, null);
return (List) XPathHelper.getByXPath(domNode, xpathExpr, null, false);
}

/**
Expand Down