[prev in list] [next in list] [prev in thread] [next in thread]
List: htmlunit-develop
Subject: [HtmlUnit] SVN: [11943] trunk/htmlunit/src
From: asashour () users ! sourceforge ! net
Date: 2016-02-29 13:42:38
Message-ID: E1aaO5x-0000EY-Uj () sfs-ml-2 ! v29 ! ch3 ! sourceforge ! com
[Download RAW message or body]
Revision: 11943
http://sourceforge.net/p/htmlunit/code/11943
Author: asashour
Date: 2016-02-29 13:42:37 +0000 (Mon, 29 Feb 2016)
Log Message:
-----------
JavaScript: fix location.hash
Modified Paths:
--------------
trunk/htmlunit/src/changes/changes.xml
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Location.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlIsIndex2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Location2Test.java
Modified: trunk/htmlunit/src/changes/changes.xml
===================================================================
--- trunk/htmlunit/src/changes/changes.xml 2016-02-29 12:58:50 UTC (rev 11942)
+++ trunk/htmlunit/src/changes/changes.xml 2016-02-29 13:42:37 UTC (rev 11943)
@@ -9,6 +9,9 @@
<body>
<release version="2.21" date="???" description="Bugfixes">
<action type="fix" dev="asashour">
+ JavaScript: fix location.hash.
+ </action>
+ <action type="fix" dev="asashour">
XMLHttpRequest: Chrome also fires state loading twice in async mode.
</action>
<action type="fix" dev="asashour">
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Location.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Location.java 2016-02-29 \
12:58:50 UTC (rev 11942)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Location.java 2016-02-29 \
13:42:37 UTC (rev 11943) @@ -297,7 +297,8 @@
public String getHash() {
final boolean decodeHash = \
getBrowserVersion().hasFeature(JS_LOCATION_HASH_IS_DECODED); String hash = hash_;
- if (decodeHash && hash_ != null) {
+
+ if (hash_ != null && (decodeHash || hash_.equals(getUrl().getRef()))) {
hash = decodeHash(hash);
}
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlIsIndex2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlIsIndex2Test.java 2016-02-29 \
12:58:50 UTC (rev 11942)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlIsIndex2Test.java 2016-02-29 \
13:42:37 UTC (rev 11943) @@ -21,7 +21,6 @@
import com.gargoylesoftware.htmlunit.BrowserRunner;
import com.gargoylesoftware.htmlunit.BrowserRunner.Alerts;
-import com.gargoylesoftware.htmlunit.BrowserRunner.NotYetImplemented;
import com.gargoylesoftware.htmlunit.WebDriverTestCase;
/**
@@ -42,7 +41,6 @@
@Test
@Alerts(DEFAULT = "null",
CHROME = "[object HTMLUnknownElement]")
- @NotYetImplemented
public void simpleScriptable() throws Exception {
final String html = "<html><head>\n"
+ "<script>\n"
@@ -60,7 +58,7 @@
final WebDriver driver = loadPageWithAlerts2(html);
if (driver instanceof HtmlUnitDriver) {
final HtmlPage page = (HtmlPage) getWebWindowOf((HtmlUnitDriver) \
driver).getEnclosedPage();
- assertTrue(HtmlIsIndex.class.isInstance(page.getHtmlElementById("myId")));
+ assertTrue(HtmlUnknownElement.class.isInstance(page.getHtmlElementById("myId")));
}
}
}
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Location2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Location2Test.java 2016-02-29 \
12:58:50 UTC (rev 11942)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Location2Test.java 2016-02-29 \
13:42:37 UTC (rev 11943) @@ -14,7 +14,6 @@
*/
package com.gargoylesoftware.htmlunit.javascript.host;
-import static com.gargoylesoftware.htmlunit.BrowserRunner.Browser.CHROME;
import static com.gargoylesoftware.htmlunit.BrowserRunner.Browser.IE;
import java.net.URL;
@@ -28,7 +27,6 @@
import com.gargoylesoftware.htmlunit.BrowserRunner;
import com.gargoylesoftware.htmlunit.BrowserRunner.Alerts;
import com.gargoylesoftware.htmlunit.BrowserRunner.BuggyWebDriver;
-import com.gargoylesoftware.htmlunit.BrowserRunner.NotYetImplemented;
import com.gargoylesoftware.htmlunit.MockWebConnection;
import com.gargoylesoftware.htmlunit.WebDriverTestCase;
@@ -205,7 +203,6 @@
*/
@Test
@Alerts("#<a>foobar</a>")
- @NotYetImplemented({ IE, CHROME })
public void hash() throws Exception {
checkHash(getDefaultUrl().toExternalForm() + "?#<a>foobar</a>");
}
------------------------------------------------------------------------------
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=272487151&iu=/4140
_______________________________________________
HtmlUnit-develop mailing list
HtmlUnit-develop@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/htmlunit-develop
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic