diff --git a/JSCover.iml b/JSCover.iml
index 060f24c4..99531161 100644
--- a/JSCover.iml
+++ b/JSCover.iml
@@ -41,22 +41,22 @@
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
+
+
+
diff --git a/JSCover.ipr b/JSCover.ipr
index e9dbf1c0..3641c9b8 100644
--- a/JSCover.ipr
+++ b/JSCover.ipr
@@ -683,6 +683,11 @@
+
+
+
+
+
@@ -740,16 +745,16 @@
-
-
+
+
-
+
-
+
-
+
@@ -764,28 +769,28 @@
-
-
+
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
@@ -824,16 +829,16 @@
-
-
+
+
-
+
-
+
-
+
@@ -920,88 +925,88 @@
-
-
+
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
diff --git a/pom.xml b/pom.xml
index baf231f6..21ed494a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,7 +83,7 @@
org.htmlunit
htmlunit
- 4.1.0
+ 4.4.0
test
diff --git a/src/test-acceptance/java/jscover/server/HtmlServerUnloadedJSProxyOnlyInstrumentRegTest.java b/src/test-acceptance/java/jscover/server/HtmlServerUnloadedJSProxyOnlyInstrumentRegTest.java
index 265144e0..6cf7df79 100644
--- a/src/test-acceptance/java/jscover/server/HtmlServerUnloadedJSProxyOnlyInstrumentRegTest.java
+++ b/src/test-acceptance/java/jscover/server/HtmlServerUnloadedJSProxyOnlyInstrumentRegTest.java
@@ -411,6 +411,7 @@ public static void tearDown() {
@Before
public void setUp() {
+ webClient.getOptions().setFileProtocolForXMLHttpRequestsAllowed(true);
ProxyConfig proxyConfig = new ProxyConfig("localhost", proxyPort, "http");
proxyConfig.addHostsToProxyBypass("127.0.0.1");
webClient.getOptions().setProxyConfig(proxyConfig);
diff --git a/src/test-acceptance/java/jscover/server/HtmlServerUnloadedJSProxyTest.java b/src/test-acceptance/java/jscover/server/HtmlServerUnloadedJSProxyTest.java
index bd0eff9b..72cc6d08 100644
--- a/src/test-acceptance/java/jscover/server/HtmlServerUnloadedJSProxyTest.java
+++ b/src/test-acceptance/java/jscover/server/HtmlServerUnloadedJSProxyTest.java
@@ -404,6 +404,7 @@ public static void tearDown() {
@Before
public void setUp() {
+ webClient.getOptions().setFileProtocolForXMLHttpRequestsAllowed(true);
ProxyConfig proxyConfig = new ProxyConfig("localhost", proxyPort, "http");
proxyConfig.addHostsToProxyBypass("127.0.0.1");
webClient.getOptions().setProxyConfig(proxyConfig);
diff --git a/src/test-acceptance/java/jscover/server/HtmlServerUnloadedJSProxyUriToFileTest.java b/src/test-acceptance/java/jscover/server/HtmlServerUnloadedJSProxyUriToFileTest.java
index b6138cf2..cb0cc883 100644
--- a/src/test-acceptance/java/jscover/server/HtmlServerUnloadedJSProxyUriToFileTest.java
+++ b/src/test-acceptance/java/jscover/server/HtmlServerUnloadedJSProxyUriToFileTest.java
@@ -416,6 +416,7 @@ public static void tearDown() {
@Before
public void setUp() {
+ webClient.getOptions().setFileProtocolForXMLHttpRequestsAllowed(true);
ProxyConfig proxyConfig = new ProxyConfig("localhost", proxyPort, "http");
proxyConfig.addHostsToProxyBypass("127.0.0.1");
webClient.getOptions().setProxyConfig(proxyConfig);
diff --git a/src/test-acceptance/java/jscover/server/HtmlServerUnloadedJSTest.java b/src/test-acceptance/java/jscover/server/HtmlServerUnloadedJSTest.java
index 9fb22362..e555c567 100644
--- a/src/test-acceptance/java/jscover/server/HtmlServerUnloadedJSTest.java
+++ b/src/test-acceptance/java/jscover/server/HtmlServerUnloadedJSTest.java
@@ -392,6 +392,7 @@ public static void tearDown() {
@Before
public void setUp() {
+ webClient.getOptions().setFileProtocolForXMLHttpRequestsAllowed(true);
webClient.getOptions().setTimeout(1000);
}
diff --git a/src/test-acceptance/java/jscover/server/HtmlUnitIsolateBrowserTest.java b/src/test-acceptance/java/jscover/server/HtmlUnitIsolateBrowserTest.java
index 54883d02..9573c84f 100644
--- a/src/test-acceptance/java/jscover/server/HtmlUnitIsolateBrowserTest.java
+++ b/src/test-acceptance/java/jscover/server/HtmlUnitIsolateBrowserTest.java
@@ -53,6 +53,7 @@ public void setUp() {
if (jsonFile.exists())
jsonFile.delete();
ioService.generateJSCoverFilesForWebServer(new File(reportDir), "isolateBrowser");
+ webClient.getOptions().setFileProtocolForXMLHttpRequestsAllowed(true);
}
protected String getTestUrl() {
diff --git a/src/test-acceptance/java/jscover/server/HtmlUnitMergeTest.java b/src/test-acceptance/java/jscover/server/HtmlUnitMergeTest.java
index 59555050..b86a96e1 100644
--- a/src/test-acceptance/java/jscover/server/HtmlUnitMergeTest.java
+++ b/src/test-acceptance/java/jscover/server/HtmlUnitMergeTest.java
@@ -403,6 +403,7 @@ public void shouldMergeUnloadedButtonSavedAndJSSavedReports() throws Exception {
String url = "file:///" + new File(reportDir + "/jscoverage.html").getAbsolutePath();
WebClient webClient = new WebClient();
+ webClient.getOptions().setFileProtocolForXMLHttpRequestsAllowed(true);
HtmlPage page = webClient.getPage(url);
webClient.waitForBackgroundJavaScript(1000);
assertEquals("53%", page.getElementById("summaryTotal").getTextContent());
diff --git a/src/test-acceptance/java/jscover/server/HtmlUnitProxyTest.java b/src/test-acceptance/java/jscover/server/HtmlUnitProxyTest.java
index e0f4fd52..77f0740e 100644
--- a/src/test-acceptance/java/jscover/server/HtmlUnitProxyTest.java
+++ b/src/test-acceptance/java/jscover/server/HtmlUnitProxyTest.java
@@ -405,6 +405,7 @@ public static void tearDown() {
@Before
public void setUp() {
+ webClient.getOptions().setFileProtocolForXMLHttpRequestsAllowed(true);
ProxyConfig proxyConfig = new ProxyConfig("localhost", proxyPort, "http");
proxyConfig.addHostsToProxyBypass("127.0.0.1");
webClient.getOptions().setProxyConfig(proxyConfig);
diff --git a/src/test-acceptance/java/jscover/server/HtmlUnitServerTest.java b/src/test-acceptance/java/jscover/server/HtmlUnitServerTest.java
index 472c6869..c12e5958 100644
--- a/src/test-acceptance/java/jscover/server/HtmlUnitServerTest.java
+++ b/src/test-acceptance/java/jscover/server/HtmlUnitServerTest.java
@@ -396,6 +396,7 @@ public static void tearDown() {
@Before
public void setUp() {
+ webClient.getOptions().setFileProtocolForXMLHttpRequestsAllowed(true);
webClient.getOptions().setTimeout(1000);
}
diff --git a/src/test-acceptance/java/jscover/ui/HtmlUnitUITest.java b/src/test-acceptance/java/jscover/ui/HtmlUnitUITest.java
index 51b0e005..25c8f61e 100644
--- a/src/test-acceptance/java/jscover/ui/HtmlUnitUITest.java
+++ b/src/test-acceptance/java/jscover/ui/HtmlUnitUITest.java
@@ -410,6 +410,7 @@ public static void tearDown() {
@Before
public void setUp() {
+ webClient.getOptions().setFileProtocolForXMLHttpRequestsAllowed(true);
webClient.getOptions().setTimeout(1000);
}