[HtmlUnit] SVN: [8797] trunk/htmlunit/src

[<rb...@us...>]

Revision: 8797
          http://sourceforge.net/p/htmlunit/code/8797
Author:   rbri
Date:     2013-11-22 20:29:54 +0000 (Fri, 22 Nov 2013)
Log Message:
-----------
first fix for url creation when submitting a form

Modified Paths:
--------------
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlForm.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/PageReloadTest.java

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlForm.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlForm.java	2013-11-22 19:20:27 UTC (rev 8796)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlForm.java	2013-11-22 20:29:54 UTC (rev 8797)
@@ -191,15 +191,10 @@
                     url = UrlUtils.getUrlWithNewRef(url, null);
                 }
             }
-            else if (actionUrl.startsWith("?")) {
+            else if (actionUrl.startsWith("?") || actionUrl.startsWith("#")) {
                 String urlString = htmlPage.getUrl().toExternalForm();
-                if (urlString.indexOf('?') != -1) {
-                    urlString = urlString.substring(0, urlString.indexOf('?'));
-                }
-                else if (urlString.indexOf('#') != -1
-                        && browser.hasFeature(FORM_SUBMISSION_URL_WITHOUT_HASH)) {
-                    urlString = urlString.substring(0, urlString.indexOf('#'));
-                }
+                urlString = StringUtils.substringBefore(urlString, "#");
+                urlString = StringUtils.substringBefore(urlString, "?");
                 url = new URL(urlString + actionUrl);
             }
             else {

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/PageReloadTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/PageReloadTest.java	2013-11-22 19:20:27 UTC (rev 8796)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/PageReloadTest.java	2013-11-22 20:29:54 UTC (rev 8797)
@@ -518,7 +518,6 @@
      */
     @Test
     @Alerts(DEFAULT = ANCHOR, IE = "")
-    @NotYetImplemented(Browser.FF)
     public void submitGetV_urlHash_hash() throws Exception {
         openUrlAndClickById(RELOAD_URL_ANCHOR, "submitGetHashV", 1, PATHNAME, getExpectedAlerts()[0]);
     }
@@ -538,7 +537,6 @@
      */
     @Test
     @Alerts(DEFAULT = ANCHOR2, IE = "")
-    @NotYetImplemented(Browser.FF)
     public void submitGetV_urlHash_differentHash() throws Exception {
         openUrlAndClickById(RELOAD_URL_ANCHOR, "submitGetDifferentHashV", 1,
                 PATHNAME, getExpectedAlerts()[0]);
@@ -1110,7 +1108,6 @@
      */
     @Test
     @Alerts(DEFAULT = ANCHOR, IE = "")
-    @NotYetImplemented(Browser.FF)
     public void jsSubmitGetV_urlHash_hash() throws Exception {
         openUrlAndClickById(RELOAD_URL_ANCHOR, "jsSubmitGetHashV", 1, PATHNAME, getExpectedAlerts()[0]);
     }
@@ -1130,7 +1127,6 @@
      */
     @Test
     @Alerts(DEFAULT = ANCHOR2, IE = "")
-    @NotYetImplemented(Browser.FF)
     public void jsSubmitGetV_urlHash_differentHash() throws Exception {
         openUrlAndClickById(RELOAD_URL_ANCHOR, "jsSubmitGetDifferentHashV",
                 1, PATHNAME, getExpectedAlerts()[0]);