htmlunit-develop — General discussion of the development of HtmlUnit

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

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

Revision: 15381
          http://sourceforge.net/p/htmlunit/code/15381
Author:   rbri
Date:     2018-06-24 12:47:59 +0000 (Sun, 24 Jun 2018)
Log Message:
-----------
ff60 support (wip)

Modified Paths:
--------------
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/HttpWebConnection3Test.java

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java	2018-06-23 09:50:50 UTC (rev 15380)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java	2018-06-24 12:47:59 UTC (rev 15381)
@@ -514,7 +514,7 @@
     HTTP_COOKIE_START_DATE_1970,
 
     /** Browser sends Upgrade-Insecure-Requests header. */
-    @BrowserFeature({CHROME, FF52})
+    @BrowserFeature({CHROME, FF})
     HTTP_HEADER_UPGRADE_INSECURE_REQUEST,
 
     /** Supports redirect via 308 code. */

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/HttpWebConnection3Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/HttpWebConnection3Test.java	2018-06-23 09:50:50 UTC (rev 15380)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/HttpWebConnection3Test.java	2018-06-24 12:47:59 UTC (rev 15381)
@@ -53,8 +53,7 @@
             FF = {HttpHeader.HOST, HttpHeader.USER_AGENT, HttpHeader.ACCEPT, HttpHeader.ACCEPT_LANGUAGE,
                         HttpHeader.ACCEPT_ENCODING, HttpHeader.CONNECTION, HttpHeader.UPGRADE_INSECURE_REQUESTS},
             IE = {HttpHeader.ACCEPT, HttpHeader.ACCEPT_LANGUAGE, HttpHeader.USER_AGENT,
-                        HttpHeader.ACCEPT_ENCODING, HttpHeader.HOST, HttpHeader.DNT, HttpHeader.CONNECTION})
-    @NotYetImplemented(IE)
+                        HttpHeader.ACCEPT_ENCODING, HttpHeader.HOST, HttpHeader.CONNECTION})
     public void headers() throws Exception {
         final String response = "HTTP/1.1 200 OK\r\n"
             + "Content-Length: 2\r\n"
@@ -99,9 +98,8 @@
                         HttpHeader.ACCEPT_ENCODING, HttpHeader.REFERER, HttpHeader.COOKIE, HttpHeader.CONNECTION,
                         HttpHeader.UPGRADE_INSECURE_REQUESTS},
             IE = {HttpHeader.ACCEPT, HttpHeader.REFERER, HttpHeader.ACCEPT_LANGUAGE, HttpHeader.USER_AGENT,
-                        HttpHeader.ACCEPT_ENCODING, HttpHeader.HOST, HttpHeader.DNT, HttpHeader.CONNECTION,
+                        HttpHeader.ACCEPT_ENCODING, HttpHeader.HOST, HttpHeader.CONNECTION,
                         HttpHeader.COOKIE})
-    @NotYetImplemented(IE)
     public void headers_cookie_referer() throws Exception {
         final String htmlResponse = "<a href='2.html'>Click me</a>";
         final String response = "HTTP/1.1 200 OK\r\n"

[HtmlUnit] SVN: [15380] trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit

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

Revision: 15380
          http://sourceforge.net/p/htmlunit/code/15380
Author:   rbri
Date:     2018-06-23 09:50:50 +0000 (Sat, 23 Jun 2018)
Log Message:
-----------
ff60 support (wip)

Modified Paths:
--------------
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlUnknownElement.java

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java	2018-06-21 19:22:38 UTC (rev 15379)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java	2018-06-23 09:50:50 UTC (rev 15380)
@@ -67,7 +67,7 @@
     CSS_COMPUTED_NO_Z_INDEX,
 
     /** Is display style of HtmlDialog is 'none'. */
-    @BrowserFeature(CHROME)
+    @BrowserFeature({CHROME, FF60})
     CSS_DIALOG_NONE,
 
     /** Is display style 'block'. */
@@ -115,7 +115,7 @@
     CSS_RP_DISPLAY_NONE,
 
     /** The default value of the display property for the 'rt' tag is always 'ruby-text'. */
-    @BrowserFeature({IE, FF})
+    @BrowserFeature({IE, FF60})
     CSS_RT_DISPLAY_RUBY_TEXT_ALWAYS,
 
     /** The default value of the display property for the 'ruby' tag is 'inline'. */
@@ -1466,7 +1466,7 @@
     RESETINPUT_DEFAULT_VALUE_IF_VALUE_NOT_DEFINED,
 
     /** The default display style of slot is 'content'. */
-    @BrowserFeature(CHROME)
+    @BrowserFeature({CHROME, FF60})
     SLOT_CONTENTS,
 
     /** Indicates that string.includes() is supported. */

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlUnknownElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlUnknownElement.java	2018-06-21 19:22:38 UTC (rev 15379)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlUnknownElement.java	2018-06-23 09:50:50 UTC (rev 15380)
@@ -14,10 +14,12 @@
  */
 package com.gargoylesoftware.htmlunit.html;
 
+import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.CSS_DIALOG_NONE;
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.CSS_RP_DISPLAY_NONE;
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.CSS_RT_DISPLAY_RUBY_TEXT_ALWAYS;
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.CSS_RUBY_DISPLAY_INLINE;
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.MULTICOL_BLOCK;
+import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.SLOT_CONTENTS;
 
 import java.util.Map;
 
@@ -98,18 +100,26 @@
                 }
                 break;
             case HtmlRt.TAG_NAME:
-                if (wasCreatedByJavascript() && getParentNode() == null) {
+                if (!hasFeature(CSS_RT_DISPLAY_RUBY_TEXT_ALWAYS)
+                        && wasCreatedByJavascript() && getParentNode() == null) {
                     return DisplayStyle.BLOCK;
                 }
-                if (hasFeature(CSS_RT_DISPLAY_RUBY_TEXT_ALWAYS)) {
-                    return DisplayStyle.RUBY_TEXT;
-                }
-                break;
+                return DisplayStyle.RUBY_TEXT;
             case HtmlMultiColumn.TAG_NAME:
                 if (hasFeature(MULTICOL_BLOCK)) {
                     return DisplayStyle.BLOCK;
                 }
                 break;
+            case HtmlDialog.TAG_NAME:
+                if (hasFeature(CSS_DIALOG_NONE)) {
+                    return DisplayStyle.NONE;
+                }
+                break;
+            case HtmlSlot.TAG_NAME:
+                if (getPage().getWebClient().getBrowserVersion().hasFeature(SLOT_CONTENTS)) {
+                    return DisplayStyle.CONTENTS;
+                }
+                break;
             default:
         }
         return DisplayStyle.INLINE;

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

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

Revision: 15379
          http://sourceforge.net/p/htmlunit/code/15379
Author:   rbri
Date:     2018-06-21 19:22:38 +0000 (Thu, 21 Jun 2018)
Log Message:
-----------
ff60 support (wip)

Modified Paths:
--------------
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Element.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElementTest.java

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java	2018-06-21 18:31:07 UTC (rev 15378)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java	2018-06-21 19:22:38 UTC (rev 15379)
@@ -955,9 +955,9 @@
     @BrowserFeature(IE)
     JS_INNER_HTML_ADD_CHILD_FOR_NULL_VALUE,
 
-    /** Indicates that innerHTML uses {@code crnl} instead of {@code nl}. */
+    /** Indicates that innerHTML uses {@code lf} instead of {@code lf}. */
     @BrowserFeature(IE)
-    JS_INNER_TEXT_CR_NL,
+    JS_INNER_TEXT_LF,
 
     /** Indicates that innerText setter supports null values. */
     @BrowserFeature({CHROME, FF52})

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Element.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Element.java	2018-06-21 18:31:07 UTC (rev 15378)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Element.java	2018-06-21 19:22:38 UTC (rev 15379)
@@ -17,7 +17,7 @@
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_BOUNDINGCLIENTRECT_THROWS_IF_DISCONNECTED;
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_ELEMENT_GET_ATTRIBUTE_RETURNS_EMPTY;
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_INNER_HTML_ADD_CHILD_FOR_NULL_VALUE;
-import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_INNER_TEXT_CR_NL;
+import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_INNER_TEXT_LF;
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_OUTER_HTML_NULL_AS_STRING;
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_OUTER_HTML_REMOVES_CHILDREN_FOR_DETACHED;
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_OUTER_HTML_THROWS_FOR_DETACHED;
@@ -733,7 +733,7 @@
      *
      * @see <a href="http://msdn.microsoft.com/en-us/library/ie/ms536451.aspx">MSDN</a>
      */
-    @JsxFunction({CHROME, FF52})
+    @JsxFunction({CHROME, FF})
     public Object insertAdjacentElement(final String where, final Object insertedElement) {
         if (insertedElement instanceof Node) {
             final DomNode childNode = ((Node) insertedElement).getDomNodeOrDie();
@@ -760,7 +760,7 @@
      *
      * @see <a href="http://msdn.microsoft.com/en-us/library/ie/ms536453.aspx">MSDN</a>
      */
-    @JsxFunction({CHROME, FF52})
+    @JsxFunction({CHROME, FF})
     public void insertAdjacentText(final String where, final String text) {
         final Object[] values = getInsertAdjacentLocation(where);
         final DomNode node = (DomNode) values[0];
@@ -1064,8 +1064,8 @@
             if (node instanceof HtmlElement) {
                 final HtmlElement element = (HtmlElement) node;
                 if ("p".equals(element.getTagName())) {
-                    if (getBrowserVersion().hasFeature(JS_INNER_TEXT_CR_NL)) {
-                        builder.append("\r\n"); // \r\n because it's to implement something IE specific
+                    if (getBrowserVersion().hasFeature(JS_INNER_TEXT_LF)) {
+                        builder.append('\n'); // \r\n because it's to implement something IE specific
                     }
                     else {
                         int i = builder.length() - 1;

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElementTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElementTest.java	2018-06-21 18:31:07 UTC (rev 15378)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElementTest.java	2018-06-21 19:22:38 UTC (rev 15379)
@@ -1776,7 +1776,7 @@
     @Test
     @Alerts(CHROME = {"Old = Old\ninnerText", "New = New cell value"},
             FF = {"Old = Old\n\ninnerText", "New = New cell value"},
-            IE = {"Old = Old \r\ninnerText", "New = New cell value"})
+            IE = {"Old = Old \ninnerText", "New = New cell value"})
     @NotYetImplemented(FF)
     public void getSetInnerTextSimple() throws Exception {
         final String html = "<html>\n"

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

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

Revision: 15378
          http://sourceforge.net/p/htmlunit/code/15378
Author:   rbri
Date:     2018-06-21 18:31:07 +0000 (Thu, 21 Jun 2018)
Log Message:
-----------
ff60 support (wip)

Modified Paths:
--------------
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclaration.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ErrorOutputChecker.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAppletElement2Test.java

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java	2018-06-21 16:42:37 UTC (rev 15377)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java	2018-06-21 18:31:07 UTC (rev 15378)
@@ -1210,6 +1210,10 @@
     @BrowserFeature(IE)
     JS_STYLE_UNSUPPORTED_PROPERTY_GETTER,
 
+    /** Indicates if style properties are always in lower case. */
+    @BrowserFeature({CHROME, FF60, IE})
+    JS_STYLE_VALUES_LOWERCASE,
+
     /** Indicates wordSpacing support percent values. */
     @BrowserFeature(FF)
     JS_STYLE_WORD_SPACING_ACCEPTS_PERCENT,
@@ -1529,14 +1533,14 @@
     @BrowserFeature(IE)
     WINDOW_EXECUTE_EVENTS,
 
+    /** XMLHttpRequest.getAllResponseHeaders() has a trailing separator. */
+    @BrowserFeature(IE)
+    XHR_ALL_RESPONSE_HEADERS_APPEND_SEPARATOR,
+
     /** XMLHttpRequest.getAllResponseHeaders() uses only Lf as separator. */
     @BrowserFeature({FF60, IE})
     XHR_ALL_RESPONSE_HEADERS_SEPARATE_BY_LF,
 
-    /** XMLHttpRequest.getAllResponseHeaders() has a trailing separator. */
-    @BrowserFeature(IE)
-    XHR_ALL_RESPONSE_HEADERS_APPEND_SEPARATOR,
-
     /** XMLHttpRequest triggers the opened event at the beginning of the send method again. */
     @BrowserFeature(IE)
     XHR_FIRE_STATE_OPENED_AGAIN_IN_ASYNC_MODE,

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclaration.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclaration.java	2018-06-21 16:42:37 UTC (rev 15377)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclaration.java	2018-06-21 18:31:07 UTC (rev 15378)
@@ -24,6 +24,7 @@
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.CSS_ZINDEX_TYPE_INTEGER;
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_STYLE_SET_PROPERTY_IMPORTANT_IGNORES_CASE;
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_STYLE_UNSUPPORTED_PROPERTY_GETTER;
+import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_STYLE_VALUES_LOWERCASE;
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_STYLE_WORD_SPACING_ACCEPTS_PERCENT;
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_STYLE_WRONG_INDEX_RETURNS_UNDEFINED;
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
@@ -1680,7 +1681,7 @@
         if (element != null && element.getValue() != null) {
             final String value = element.getValue();
             if (!value.contains("url")
-                    && getBrowserVersion().hasFeature(JS_STYLE_SET_PROPERTY_IMPORTANT_IGNORES_CASE)) {
+                    && getBrowserVersion().hasFeature(JS_STYLE_VALUES_LOWERCASE)) {
                 return value.toLowerCase(Locale.ROOT);
             }
             return value;

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ErrorOutputChecker.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ErrorOutputChecker.java	2018-06-21 16:42:37 UTC (rev 15377)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ErrorOutputChecker.java	2018-06-21 18:31:07 UTC (rev 15378)
@@ -37,12 +37,10 @@
     private PrintStream originalErr_;
     private final ByteArrayOutputStream baos_ = new ByteArrayOutputStream();
     private static final Pattern[] PATTERNS = {
-
             // chrome
             Pattern.compile("Starting ChromeDriver " + ExternalTest.CHROME_DRIVER_.replace(".", "\\.")
                     + "\\.[0-9]+ ?\\(?[0-9a-f]*\\)? on port \\d*\r?\n"
                     + "Only local connections are allowed\\.\r?\n"),
-
             // GeckoDriver
             Pattern.compile("[0-9]*\\sgeckodriver\\sINFO\\sgeckodriver "
                                 + ExternalTest.GECKO_DRIVER_.replace(".", "\\.") + ".*", Pattern.DOTALL),
@@ -51,7 +49,6 @@
                     + "3\\.8\\.0\\.0\r?\n"
                     + "Listening on port \\d*\r?\n"
                     + "Only local connections are allowed\r?\n"),
-
             // edge
             Pattern.compile(".*Listening on http://localhost:\\d*/ \r\r?\n"),
             Pattern.compile(".*Stopping server.\r\r?\n"),

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAppletElement2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAppletElement2Test.java	2018-06-21 16:42:37 UTC (rev 15377)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAppletElement2Test.java	2018-06-21 18:31:07 UTC (rev 15378)
@@ -43,7 +43,8 @@
      */
     @Test
     public void callAppletMethodFromJS() throws Exception {
-        if (getBrowserVersion().isChrome()) {
+        if (getBrowserVersion().isChrome()
+                || (getBrowserVersion().isFirefox() && !getBrowserVersion().isFirefox52())) {
             return;
         }
 

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

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

Revision: 15377
          http://sourceforge.net/p/htmlunit/code/15377
Author:   rbri
Date:     2018-06-21 16:42:37 +0000 (Thu, 21 Jun 2018)
Log Message:
-----------
ff60 support (wip)

Modified Paths:
--------------
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestTest.java

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java	2018-06-21 16:36:25 UTC (rev 15376)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java	2018-06-21 16:42:37 UTC (rev 15377)
@@ -1562,10 +1562,6 @@
     @BrowserFeature({CHROME, FF})
     XHR_OPEN_ALLOW_EMTPY_URL,
 
-    /** Indicates that method overrideMimeType throws if msg was already sent. */
-    @BrowserFeature({CHROME, FF52, IE})
-    XHR_OVERRIDE_MIME_TYPE_BEFORE_SEND,
-
     /** Indicates that the content charset is used for response parsing. */
     @BrowserFeature(FF)
     XHR_USE_CONTENT_CHARSET,

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequest.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequest.java	2018-06-21 16:36:25 UTC (rev 15376)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequest.java	2018-06-21 16:42:37 UTC (rev 15377)
@@ -21,7 +21,6 @@
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.XHR_LENGTH_COMPUTABLE;
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.XHR_NO_CROSS_ORIGIN_TO_ABOUT;
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.XHR_OPEN_ALLOW_EMTPY_URL;
-import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.XHR_OVERRIDE_MIME_TYPE_BEFORE_SEND;
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.XHR_USE_CONTENT_CHARSET;
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.XHR_USE_DEFAULT_CHARSET_FROM_PAGE;
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.XHR_WITHCREDENTIALS_ALLOW_ORIGIN_ALL;
@@ -938,8 +937,7 @@
      */
     @JsxFunction
     public void overrideMimeType(final String mimeType) {
-        if (getBrowserVersion().hasFeature(XHR_OVERRIDE_MIME_TYPE_BEFORE_SEND)
-                && state_ != UNSENT && state_ != OPENED) {
+        if (state_ != UNSENT && state_ != OPENED) {
             throw Context.reportRuntimeError("Property 'overrideMimeType' not writable after sent.");
         }
         overriddenMimeType_ = mimeType;

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestTest.java	2018-06-21 16:36:25 UTC (rev 15376)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestTest.java	2018-06-21 16:42:37 UTC (rev 15377)
@@ -16,7 +16,6 @@
 
 import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.CHROME;
 import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.FF;
-import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.FF52;
 import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.IE;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
@@ -1587,7 +1586,7 @@
                     "\nfunction onreadystatechange() {\n    [native code]\n}\n",
                     "\nfunction onreadystatechange() {\n    [native code]\n}\n",
                     "true", "true"})
-    @NotYetImplemented({CHROME, FF52})
+    @NotYetImplemented({CHROME, FF})
     public void getOwnPropertyDescriptor() throws Exception {
         final String html =
               "<html>\n"

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

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

Revision: 15376
          http://sourceforge.net/p/htmlunit/code/15376
Author:   rbri
Date:     2018-06-21 16:36:25 +0000 (Thu, 21 Jun 2018)
Log Message:
-----------
ff60 support (wip)

Modified Paths:
--------------
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequest2Test.java

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java	2018-06-21 16:12:46 UTC (rev 15375)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java	2018-06-21 16:36:25 UTC (rev 15376)
@@ -1529,9 +1529,13 @@
     @BrowserFeature(IE)
     WINDOW_EXECUTE_EVENTS,
 
-    /** XMLHttpRequest.getAllResponseHeaders() has a trailing CrLf. */
+    /** XMLHttpRequest.getAllResponseHeaders() uses only Lf as separator. */
+    @BrowserFeature({FF60, IE})
+    XHR_ALL_RESPONSE_HEADERS_SEPARATE_BY_LF,
+
+    /** XMLHttpRequest.getAllResponseHeaders() has a trailing separator. */
     @BrowserFeature(IE)
-    XHR_ALL_RESPONSE_HEADERS_APPEND_CRLF,
+    XHR_ALL_RESPONSE_HEADERS_APPEND_SEPARATOR,
 
     /** XMLHttpRequest triggers the opened event at the beginning of the send method again. */
     @BrowserFeature(IE)

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequest.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequest.java	2018-06-21 16:12:46 UTC (rev 15375)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequest.java	2018-06-21 16:36:25 UTC (rev 15376)
@@ -14,7 +14,8 @@
  */
 package com.gargoylesoftware.htmlunit.javascript.host.xml;
 
-import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.XHR_ALL_RESPONSE_HEADERS_APPEND_CRLF;
+import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.XHR_ALL_RESPONSE_HEADERS_APPEND_SEPARATOR;
+import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.XHR_ALL_RESPONSE_HEADERS_SEPARATE_BY_LF;
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.XHR_FIRE_STATE_OPENED_AGAIN_IN_ASYNC_MODE;
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.XHR_IGNORE_PORT_FOR_SAME_ORIGIN;
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.XHR_LENGTH_COMPUTABLE;
@@ -460,10 +461,18 @@
         if (webResponse_ != null) {
             final StringBuilder builder = new StringBuilder();
             for (final NameValuePair header : webResponse_.getResponseHeaders()) {
-                builder.append(header.getName()).append(": ").append(header.getValue()).append("\r\n");
+                builder.append(header.getName()).append(": ").append(header.getValue());
+
+                if (!getBrowserVersion().hasFeature(XHR_ALL_RESPONSE_HEADERS_SEPARATE_BY_LF)) {
+                    builder.append('\r');
+                }
+                builder.append('\n');
             }
-            if (getBrowserVersion().hasFeature(XHR_ALL_RESPONSE_HEADERS_APPEND_CRLF)) {
-                builder.append("\r\n");
+            if (getBrowserVersion().hasFeature(XHR_ALL_RESPONSE_HEADERS_APPEND_SEPARATOR)) {
+                if (!getBrowserVersion().hasFeature(XHR_ALL_RESPONSE_HEADERS_SEPARATE_BY_LF)) {
+                    builder.append('\r');
+                }
+                builder.append('\n');
             }
             return builder.toString();
         }

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequest2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequest2Test.java	2018-06-21 16:12:46 UTC (rev 15375)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequest2Test.java	2018-06-21 16:36:25 UTC (rev 15376)
@@ -15,6 +15,7 @@
 package com.gargoylesoftware.htmlunit.javascript.host.xml;
 
 import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.CHROME;
+import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.FF60;
 import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.IE;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
@@ -950,10 +951,10 @@
                 + "Transfer-Encoding: chunked\r\n"
                 + "Server: Jetty(XXX)\r\n"},
             IE = {"", "",
-                "Date XYZ GMT\r\n"
-                + "Content-Type: text/xml;charset=iso-8859-1\r\n"
-                + "Transfer-Encoding: chunked\r\n"
-                + "Server: Jetty(XXX)\r\n\r\n"},
+                "Date XYZ GMT\n"
+                + "Content-Type: text/xml;charset=iso-8859-1\n"
+                + "Transfer-Encoding: chunked\n"
+                + "Server: Jetty(XXX)\n\n"},
             CHROME = {"", "",
                 "date XYZ GMT\r\n"
                 + "server: Jetty(XXX)\r\n"
@@ -964,7 +965,7 @@
                 + "Date XYZ GMT\n"
                 + "Server: Jetty(XXX)\n"
                 + "Transfer-Encoding: chunked\n"})
-    @NotYetImplemented(CHROME)
+    @NotYetImplemented({CHROME, FF60})
     public void getAllResponseHeaders() throws Exception {
         final String html =
                 "<html>\n"

[HtmlUnit] SVN: [15375] trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit

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

Revision: 15375
          http://sourceforge.net/p/htmlunit/code/15375
Author:   rbri
Date:     2018-06-21 16:12:46 +0000 (Thu, 21 Jun 2018)
Log Message:
-----------
ff60 support (wip)

Modified Paths:
--------------
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/CanvasRenderingContext2D.java

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java	2018-06-20 20:11:04 UTC (rev 15374)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java	2018-06-21 16:12:46 UTC (rev 15375)
@@ -152,7 +152,7 @@
         // FF52
         FIREFOX_52.applicationVersion_ = "5.0 (Windows)";
         FIREFOX_52.userAgent_ = "Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:52.0) Gecko/20100101 Firefox/52.0";
-        FIREFOX_52.buildId_ = "20180315163333";
+        FIREFOX_52.buildId_ = "20180430140610";
         FIREFOX_52.productSub_ = "20100101";
         FIREFOX_52.headerNamesOrdered_ = new String[] {
             HttpHeader.HOST,
@@ -352,13 +352,13 @@
 
         // flush plugin (windows version)
         PluginConfiguration flash = new PluginConfiguration("Shockwave Flash",
-                "Shockwave Flash 29.0 r0", "29.0.0.140", "NPSWF64_29_0_0_140.dll");
+                "Shockwave Flash 30.0 r0", "30.0.0.113", "NPSWF64_30_0_0_113.dll");
         flash.getMimeTypes().add(new PluginConfiguration.MimeType("application/x-shockwave-flash",
                 "Shockwave Flash", "swf"));
         FIREFOX_52.plugins_.add(flash);
 
         flash = new PluginConfiguration("Shockwave Flash",
-                "Shockwave Flash 29.0 r0", "29.0.0.140", "Flash32_29_0_0_140.ocx");
+                "Shockwave Flash 30.0 r0", "30.0.0.113", "Flash32_30_0_0_113.ocx");
         flash.getMimeTypes().add(new PluginConfiguration.MimeType("application/x-shockwave-flash",
                 "Shockwave Flash", "swf"));
         INTERNET_EXPLORER.plugins_.add(flash);

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/CanvasRenderingContext2D.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/CanvasRenderingContext2D.java	2018-06-20 20:11:04 UTC (rev 15374)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/CanvasRenderingContext2D.java	2018-06-21 16:12:46 UTC (rev 15375)
@@ -17,7 +17,6 @@
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.EDGE;
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF52;
 
 import java.io.IOException;
 
@@ -364,7 +363,7 @@
      * @param endAngle the endAngle
      * @param anticlockwise the anticlockwise
      */
-    @JsxFunction({CHROME, FF52})
+    @JsxFunction({CHROME, FF})
     public void ellipse(final double x, final double y,
                     final double radiusX, final double radiusY,
                     final double rotation, final double startAngle, final double endAngle,

[HtmlUnit] SVN: [15374] trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit

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

Revision: 15374
          http://sourceforge.net/p/htmlunit/code/15374
Author:   rbri
Date:     2018-06-20 20:11:04 +0000 (Wed, 20 Jun 2018)
Log Message:
-----------
simplify patterns, check geckodriver version also

Modified Paths:
--------------
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ErrorOutputChecker.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ExternalTest.java

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ErrorOutputChecker.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ErrorOutputChecker.java	2018-06-20 18:42:28 UTC (rev 15373)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ErrorOutputChecker.java	2018-06-20 20:11:04 UTC (rev 15374)
@@ -37,33 +37,25 @@
     private PrintStream originalErr_;
     private final ByteArrayOutputStream baos_ = new ByteArrayOutputStream();
     private static final Pattern[] PATTERNS = {
+
+            // chrome
             Pattern.compile("Starting ChromeDriver " + ExternalTest.CHROME_DRIVER_.replace(".", "\\.")
                     + "\\.[0-9]+ ?\\(?[0-9a-f]*\\)? on port \\d*\r?\n"
                     + "Only local connections are allowed\\.\r?\n"),
-            Pattern.compile(".*Unable to retrieve document state unexpected alert open\r?\n"),
-            Pattern.compile(".*FirefoxOptions toCapabilities\r?\n"),
-            Pattern.compile(".*Preferring the firefox binary in these options \\(.*\\)\r?\n"),
-            Pattern.compile(".*geckodriver.*\r?\n"),
-            Pattern.compile(".*mozprofile.*\r?\n"),
-            Pattern.compile(".*Marionette.*\r?\n"),
-            Pattern.compile(".*\tDEBUG\t.*\r?\n"),
-            Pattern.compile(".*\taddons\\..*\r?\n"),
-            Pattern.compile("\\*\\*\\* Blocklist::.*\r?\n"),
+
+            // GeckoDriver
+            Pattern.compile("[0-9]*\\sgeckodriver\\sINFO\\sgeckodriver "
+                                + ExternalTest.GECKO_DRIVER_.replace(".", "\\.") + ".*", Pattern.DOTALL),
+            // ie
             Pattern.compile("Started InternetExplorerDriver server \\(\\d\\d\\-bit\\)\r?\n"
                     + "3\\.8\\.0\\.0\r?\n"
                     + "Listening on port \\d*\r?\n"
                     + "Only local connections are allowed\r?\n"),
+
             // edge
             Pattern.compile(".*Listening on http://localhost:\\d*/ \r\r?\n"),
-            // edge
             Pattern.compile(".*Stopping server.\r\r?\n"),
             Pattern.compile(".*ProtocolHandshake createSession\r?\n(INFO|INFORMATION): Detected dialect: .*\r?\n"),
-
-            // FF60 output
-            Pattern.compile("Unable to read VR Path Registry from .*\r\r?\n"),
-            Pattern.compile("JavaScript warning: .*: String.toLowerCase is deprecated;"
-                                + " use String.prototype.toLowerCase instead\r\r?\n")
-
     };
 
     /**

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ExternalTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ExternalTest.java	2018-06-20 18:42:28 UTC (rev 15373)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ExternalTest.java	2018-06-20 20:11:04 UTC (rev 15374)
@@ -33,6 +33,8 @@
 import org.apache.commons.io.FileUtils;
 import org.junit.Test;
 
+import com.gargoylesoftware.htmlunit.html.DomNode;
+import com.gargoylesoftware.htmlunit.html.DomNodeList;
 import com.gargoylesoftware.htmlunit.html.HtmlAnchor;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import com.gargoylesoftware.htmlunit.html.HtmlTable;
@@ -81,8 +83,11 @@
                     }
                 }
             }
+
             assertVersion("org.sonatype.oss", "oss-parent", "9");
+
             assertChromeDriver();
+            assertGeckoDriver();
         }
     }
 
@@ -107,6 +112,14 @@
         }
     }
 
+    private static void assertGeckoDriver() throws Exception {
+        try (WebClient webClient = getWebClient()) {
+            final HtmlPage page = webClient.getPage("https://github.com/mozilla/geckodriver/releases/latest");
+            final DomNodeList<DomNode> divs = page.querySelectorAll(".release-title");
+            assertEquals("Gecko Driver", divs.get(0).asText(), "v" + GECKO_DRIVER_);
+        }
+    }
+
     /**
      * Tests that the deployed snapshot is not more than two weeks old.
      *

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

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

Revision: 15373
          http://sourceforge.net/p/htmlunit/code/15373
Author:   rbri
Date:     2018-06-20 18:42:28 +0000 (Wed, 20 Jun 2018)
Log Message:
-----------
WebClient default request header should not overwrite request-specific ones

Modified Paths:
--------------
    trunk/htmlunit/src/changes/changes.xml
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebClient.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebClientTest.java

Modified: trunk/htmlunit/src/changes/changes.xml
===================================================================
--- trunk/htmlunit/src/changes/changes.xml	2018-06-20 17:47:33 UTC (rev 15372)
+++ trunk/htmlunit/src/changes/changes.xml	2018-06-20 18:42:28 UTC (rev 15373)
@@ -8,6 +8,9 @@
 
     <body>
         <release version="2.32" date="xx 2018" description="Bugfixes, FIREFOX_45 removed, FIREFOX_60 added">
+            <action type="fix" dev="rbri" issue="1970">
+                WebClient default request header should not overwrite request-specific ones.
+            </action>
             <action type="fix" dev="rbri" issue="1962">
                 Various fixes for the selector specificity calculation (CssParser).
             </action>

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebClient.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebClient.java	2018-06-20 17:47:33 UTC (rev 15372)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebClient.java	2018-06-20 18:42:28 UTC (rev 15373)
@@ -1480,8 +1480,13 @@
                 && !wrs.isAdditionalHeader(HttpHeader.UPGRADE_INSECURE_REQUESTS)) {
             wrs.setAdditionalHeader(HttpHeader.UPGRADE_INSECURE_REQUESTS, "1");
         }
+
         // Add user-specified headers last so that they can override HtmlUnit defaults.
-        wrs.getAdditionalHeaders().putAll(requestHeaders_);
+        requestHeaders_.forEach((name, value) -> {
+            if (!wrs.isAdditionalHeader(name)) {
+                wrs.setAdditionalHeader(name, value);
+            }
+        });
     }
 
     /**

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebClientTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebClientTest.java	2018-06-20 17:47:33 UTC (rev 15372)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebClientTest.java	2018-06-20 18:42:28 UTC (rev 15373)
@@ -20,6 +20,7 @@
 import static org.easymock.EasyMock.expectLastCall;
 import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.verify;
+import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.fail;
 
 import java.io.ByteArrayOutputStream;
@@ -1519,6 +1520,32 @@
     }
 
     /**
+     * @throws Exception if something goes wrong
+     */
+    @Test
+    public void requestHeaderDoNotOverwriteExisting() throws Exception {
+        final String content = "<html></html>";
+        final WebClient client = getWebClient();
+
+        final MockWebConnection webConnection = new MockWebConnection();
+        webConnection.setDefaultResponse(content);
+        client.setWebConnection(webConnection);
+
+        client.getPage(URL_FIRST);
+        assertNotNull(webConnection.getLastAdditionalHeaders().get(HttpHeader.ACCEPT_LANGUAGE));
+        assertNotEquals("foo value", webConnection.getLastAdditionalHeaders().get(HttpHeader.ACCEPT_LANGUAGE));
+
+        client.addRequestHeader(HttpHeader.ACCEPT_LANGUAGE, "foo value");
+        client.getPage(URL_FIRST);
+        assertNotEquals("foo value", webConnection.getLastAdditionalHeaders().get(HttpHeader.ACCEPT_LANGUAGE));
+
+        client.removeRequestHeader(HttpHeader.ACCEPT_LANGUAGE);
+        client.getPage(URL_FIRST);
+        assertNotNull(webConnection.getLastAdditionalHeaders().get(HttpHeader.ACCEPT_LANGUAGE));
+        assertNotEquals("foo value", webConnection.getLastAdditionalHeaders().get(HttpHeader.ACCEPT_LANGUAGE));
+    }
+
+    /**
      * Test that content type is looked in a case insensitive way.
      * Cf <a href="http://www.ietf.org/rfc/rfc2045.txt">RFC 2045</a>:
      * "All media type values, subtype values, and parameter names as defined

[HtmlUnit] [htmlunit:bugs] #1970 Default request header overwrite request-specific ones

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

- **status**: open --> closed
- **assigned_to**: RBRi
- **Comment**:

Fixed in SVN; will create a new snapshot build. The ff60 integration still requires some time.



---

** [bugs:#1970] Default request header overwrite request-specific ones**

**Status:** closed
**Group:** 2.31
**Created:** Wed Jun 20, 2018 07:57 AM UTC by Hartmut Arlt
**Last Updated:** Wed Jun 20, 2018 07:57 AM UTC
**Owner:** RBRi


Hi Guys,

We have noticed that the default request header - added via `WebClient#addRequestHeader(String,String)` - are unconditionally added to the request passed in `WebClient#loadWebResponse(WebRequest)`.  This causes any headers already set at the request to be overwritten.

As far as I understand, default headers have lower priority than the request-specific ones. Thus, the method `WebClient#addDefaultHeaders(WebRequest)` should add only those default headers that haven't been already set at the given request:
```java
    /**
     * Adds the headers that are sent with every request to the specified {@link WebRequest} instance.
     * @param wrs the <tt>WebRequestSettings</tt> instance to modify
     */
    private void addDefaultHeaders(final WebRequest wrs) {
        // Add standard HtmlUnit headers.
        if (!wrs.isAdditionalHeader(HttpHeader.ACCEPT_LANGUAGE)) {
            wrs.setAdditionalHeader(HttpHeader.ACCEPT_LANGUAGE, getBrowserVersion().getBrowserLanguage());
        }
        if (getBrowserVersion().hasFeature(HTTP_HEADER_UPGRADE_INSECURE_REQUEST)
                && !wrs.isAdditionalHeader(HttpHeader.UPGRADE_INSECURE_REQUESTS)) {
            wrs.setAdditionalHeader(HttpHeader.UPGRADE_INSECURE_REQUESTS, "1");
        }
        // Add user-specified headers last so that they can override HtmlUnit defaults.
        requestHeaders_.forEach((n,v) -> {
           if(!wrs.isAdditionalHeader(n)) {
               wrs.setAdditionalHeader(n, v);
           }
        });
    }

```

Thanks,
Hartmut


---

Sent from sourceforge.net because htm...@li... is subscribed to https://sourceforge.net/p/htmlunit/bugs/

To unsubscribe from further messages, a project admin can change settings at https://sourceforge.net/p/htmlunit/admin/bugs/options.  Or, if this is a mailing list, you can unsubscribe from the mailing list.

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

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

Revision: 15372
          http://sourceforge.net/p/htmlunit/code/15372
Author:   rbri
Date:     2018-06-20 17:47:33 +0000 (Wed, 20 Jun 2018)
Log Message:
-----------
ff60 support (wip)

Modified Paths:
--------------
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAnchorElement2Test.java

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java	2018-06-20 17:44:22 UTC (rev 15371)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java	2018-06-20 17:47:33 UTC (rev 15372)
@@ -1000,7 +1000,7 @@
     JS_Iterator,
 
     /** Property form for label always returns null. */
-    @BrowserFeature({CHROME, FF52})
+    @BrowserFeature({CHROME, FF})
     JS_LABEL_FORM_NULL,
 
     /** location.hash returns an encoded hash. */

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAnchorElement2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAnchorElement2Test.java	2018-06-20 17:44:22 UTC (rev 15371)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAnchorElement2Test.java	2018-06-20 17:47:33 UTC (rev 15372)
@@ -690,7 +690,9 @@
             IE = {"http:||||||/", "https:||||||/", "mailto:||||||fo...@fo...", "tel:||||||123456",
                         "foo:||||||blabla", "file:||||||/p://", "file:||||||/p:/", "file:||||||/p:/TeMp"},
             CHROME = {":||||||", ":||||||", "mailto:||||||fo...@fo...", "tel:||||||123456",
-                        "foo:||||||blabla", "file:||||||/P://", "file:||||||/P:/", "file:||||||/P:/TeMp"})
+                        "foo:||||||blabla", "file:||||||/P://", "file:||||||/P:/", "file:||||||/P:/TeMp"},
+            FF60 = {"http:||||||", "http:||||||", "mailto:||||||", "tel:||||||",
+                    "foo:||||||", "p:||||||", "p:||||||", "p:||||||"})
     public void propertiesNonStandardHref() throws Exception {
         final String html = "<html>\n"
             + "<body>\n"
@@ -815,13 +817,11 @@
      * @throws Exception if an error occurs
      */
     @Test
-    @Alerts(DEFAULT = {"undefined-null", "undefined-", "undefined-  \t ",
+    @Alerts(DEFAULT = {"-null", "-", "-  \t ", "no-referrer-no-referrer",
+                        "origin-origin", "unsafe-url-unsafe-url", "-unknown"},
+            IE = {"undefined-null", "undefined-", "undefined-  \t ",
                         "undefined-no-referrer", "undefined-origin",
-                        "undefined-unsafe-url", "undefined-unknown"},
-            CHROME = {"-null", "-", "-  \t ", "no-referrer-no-referrer",
-                        "origin-origin", "unsafe-url-unsafe-url", "-unknown"},
-            FF52 = {"-null", "-", "-  \t ", "no-referrer-no-referrer",
-                        "origin-origin", "unsafe-url-unsafe-url", "-unknown"})
+                        "undefined-unsafe-url", "undefined-unknown"})
     public void referrerPolicy() throws Exception {
         final String html =
                 "<html>\n"
@@ -853,13 +853,11 @@
      * @throws Exception if an error occurs
      */
     @Test
-    @Alerts(DEFAULT = {"undefined-origin", "unknown-origin", "no-referrer-origin",
+    @Alerts(DEFAULT = {"origin-origin", "-unknown", "no-referrer-no-referrer",
+                        "-", "no-referrer-NO-reFerrer", "origin-origin", "- ", "-unknown"},
+            IE = {"undefined-origin", "unknown-origin", "no-referrer-origin",
                         "-origin", "NO-reFerrer-origin", "NO-reFerrer-origin",
-                        "NO-reFerrer- ", "NO-reFerrer-unknown"},
-            CHROME = {"origin-origin", "-unknown", "no-referrer-no-referrer",
-                        "-", "no-referrer-NO-reFerrer", "origin-origin", "- ", "-unknown"},
-            FF52 = {"origin-origin", "-unknown", "no-referrer-no-referrer",
-                        "-", "no-referrer-NO-reFerrer", "origin-origin", "- ", "-unknown"})
+                        "NO-reFerrer- ", "NO-reFerrer-unknown"})
     public void setReferrerPolicy() throws Exception {
         final String html =
                 "<html>\n"

[HtmlUnit] SVN: [15371] trunk/htmlunit

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

Revision: 15371
          http://sourceforge.net/p/htmlunit/code/15371
Author:   rbri
Date:     2018-06-20 17:44:22 +0000 (Wed, 20 Jun 2018)
Log Message:
-----------
update pom

Modified Paths:
--------------
    trunk/htmlunit/pom.xml
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ExternalTest.java

Modified: trunk/htmlunit/pom.xml
===================================================================
--- trunk/htmlunit/pom.xml	2018-06-20 10:04:37 UTC (rev 15370)
+++ trunk/htmlunit/pom.xml	2018-06-20 17:44:22 UTC (rev 15371)
@@ -222,7 +222,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>3.5.0</version>
+                <version>3.5.1</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
@@ -265,7 +265,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
-                        <version>2.21.0</version>
+                        <version>2.22.0</version>
                         <configuration>
                             <excludes>
                                 <exclude>**/huge/*.java</exclude>
@@ -291,7 +291,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
-                        <version>2.21.0</version>
+                        <version>2.22.0</version>
                         <configuration>
                             <excludes>
                                 <exclude>**/libraries/*.java</exclude>
@@ -318,7 +318,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
-                        <version>2.21.0</version>
+                        <version>2.22.0</version>
                         <configuration>
                             <includes>
                                 <include>**/libraries/*.java</include>
@@ -344,7 +344,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
-                        <version>2.21.0</version>
+                        <version>2.22.0</version>
                         <configuration>
                             <includes>
                                 <include>**/huge/*.java</include>
@@ -842,7 +842,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-text</artifactId>
-            <version>1.3</version>
+            <version>1.4</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ExternalTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ExternalTest.java	2018-06-20 10:04:37 UTC (rev 15370)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ExternalTest.java	2018-06-20 17:44:22 UTC (rev 15371)
@@ -49,6 +49,8 @@
 
     /** Chrome driver. */
     static String CHROME_DRIVER_ = "2.40";
+    /** Gecko driver. */
+    static String GECKO_DRIVER_ = "0.21.0";
 
     /**
      * Tests that POM dependencies are the latest.

[HtmlUnit] SVN: [15370] trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit

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

Revision: 15370
          http://sourceforge.net/p/htmlunit/code/15370
Author:   rbri
Date:     2018-06-20 10:04:37 +0000 (Wed, 20 Jun 2018)
Log Message:
-----------
ff60 support (wip)

Modified Paths:
--------------
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFrame2Test.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlNumberInputTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/URLSearchParamsTest.java

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFrame2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFrame2Test.java	2018-06-20 10:04:14 UTC (rev 15369)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFrame2Test.java	2018-06-20 10:04:37 UTC (rev 15370)
@@ -15,6 +15,7 @@
 package com.gargoylesoftware.htmlunit.html;
 
 import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.CHROME;
+import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.FF60;
 
 import java.net.URL;
 
@@ -103,7 +104,7 @@
             FF60 = "second undefined third [object HTMLFormElement] "
                     + "parent [object HTMLFormElement]")
     // real FF sometimes alerts 'third' before 'second'
-    @NotYetImplemented(CHROME)
+    @NotYetImplemented({CHROME, FF60})
     public void postponeLoading() throws Exception {
         final String html = "<FRAMESET rows='50%,*' "
                 + "onload=\"document.title += ' parent ' + window.parent.frames['third'].document.frm\">\n"

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlNumberInputTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlNumberInputTest.java	2018-06-20 10:04:14 UTC (rev 15369)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlNumberInputTest.java	2018-06-20 10:04:37 UTC (rev 15370)
@@ -31,7 +31,7 @@
 import com.gargoylesoftware.htmlunit.WebDriverTestCase;
 
 /**
- * Tests for {@link HtmlTextInput}.
+ * Tests for {@link HtmlNumberInput}.
  *
  * @author Ronald Brill
  */

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/URLSearchParamsTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/URLSearchParamsTest.java	2018-06-20 10:04:14 UTC (rev 15369)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/URLSearchParamsTest.java	2018-06-20 10:04:37 UTC (rev 15370)
@@ -15,7 +15,6 @@
 package com.gargoylesoftware.htmlunit.javascript.host;
 
 import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.CHROME;
-import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.FF60;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -39,7 +38,6 @@
     @Test
     @Alerts(DEFAULT = {"foo=1&bar=2", ""},
             IE = {})
-    @NotYetImplemented(FF60)
     public void ctor() throws Exception {
         final String html =
             "<html>\n"

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

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

Revision: 15369
          http://sourceforge.net/p/htmlunit/code/15369
Author:   rbri
Date:     2018-06-20 10:04:14 +0000 (Wed, 20 Jun 2018)
Log Message:
-----------
ff60 support (wip)

Modified Paths:
--------------
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/History.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/ElementPropertiesTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/HostClassNameTest.java

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java	2018-06-20 07:02:52 UTC (rev 15368)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java	2018-06-20 10:04:14 UTC (rev 15369)
@@ -1507,7 +1507,7 @@
      * Indicates, that the pathname for the url 'blank' is empty;
      * instead of 'blank'.
      */
-    @BrowserFeature({CHROME, FF52})
+    @BrowserFeature({CHROME, FF})
     URL_ABOUT_BLANK_HAS_BLANK_PATH,
 
     /**

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/History.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/History.java	2018-06-20 07:02:52 UTC (rev 15368)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/History.java	2018-06-20 10:04:14 UTC (rev 15369)
@@ -17,7 +17,6 @@
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.EDGE;
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF52;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
@@ -168,7 +167,7 @@
      * Returns the {@code scrollRestoration} property.
      * @return the {@code scrollRestoration} property
      */
-    @JsxGetter({CHROME, FF52})
+    @JsxGetter({CHROME, FF})
     public String getScrollRestoration() {
         return scrollRestoration_;
     }
@@ -176,7 +175,7 @@
     /**
      * @param scrollRestoration the new value
      */
-    @JsxSetter({CHROME, FF52})
+    @JsxSetter({CHROME, FF})
     public void setScrollRestoration(final String scrollRestoration) {
         if (SCROLL_RESTAURATION_AUTO.equals(scrollRestoration)) {
             scrollRestoration_ = SCROLL_RESTAURATION_AUTO;

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/ElementPropertiesTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/ElementPropertiesTest.java	2018-06-20 07:02:52 UTC (rev 15368)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/ElementPropertiesTest.java	2018-06-20 10:04:14 UTC (rev 15369)
@@ -17,6 +17,7 @@
 import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.CHROME;
 import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.EDGE;
 import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.FF;
+import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.FF52;
 import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.IE;
 import static java.nio.charset.StandardCharsets.ISO_8859_1;
 
@@ -911,7 +912,7 @@
                 + "width",
             CHROME = "-",
             FF60 = "-")
-    @NotYetImplemented({FF, IE})
+    @NotYetImplemented({FF52, IE})
     public void applet() throws Exception {
         test("applet");
     }

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/HostClassNameTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/HostClassNameTest.java	2018-06-20 07:02:52 UTC (rev 15368)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/HostClassNameTest.java	2018-06-20 10:04:14 UTC (rev 15369)
@@ -17,6 +17,7 @@
 import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.CHROME;
 import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.EDGE;
 import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.FF;
+import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.FF60;
 import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.IE;
 
 import org.junit.Test;
@@ -23,10 +24,10 @@
 import org.junit.runner.RunWith;
 
 import com.gargoylesoftware.htmlunit.BrowserRunner;
-import com.gargoylesoftware.htmlunit.HttpHeader;
 import com.gargoylesoftware.htmlunit.BrowserRunner.Alerts;
 import com.gargoylesoftware.htmlunit.BrowserRunner.AlertsStandards;
 import com.gargoylesoftware.htmlunit.BrowserRunner.NotYetImplemented;
+import com.gargoylesoftware.htmlunit.HttpHeader;
 import com.gargoylesoftware.htmlunit.WebDriverTestCase;
 import com.gargoylesoftware.htmlunit.annotations.StandardsMode;
 
@@ -7205,7 +7206,7 @@
     @Alerts(DEFAULT = "exception",
             CHROME = "function RTCDataChannel() { [native code] }",
             FF60 = "function RTCDataChannel() {\n    [native code]\n}")
-    @NotYetImplemented(CHROME)
+    @NotYetImplemented({CHROME, FF60})
     public void rtcDataChannel() throws Exception {
         test("RTCDataChannel");
     }
@@ -10241,6 +10242,7 @@
     @Test
     @Alerts(DEFAULT = "exception",
             FF60 = "function VRDisplay() {\n    [native code]\n}")
+    @NotYetImplemented(FF60)
     public void vrDisplay() throws Exception {
         test("VRDisplay");
     }
@@ -10251,6 +10253,7 @@
     @Test
     @Alerts(DEFAULT = "exception",
             FF60 = "function VRDisplayCapabilities() {\n    [native code]\n}")
+    @NotYetImplemented(FF60)
     public void vrDisplayCapabilities() throws Exception {
         test("VRDisplayCapabilities");
     }
@@ -10261,6 +10264,7 @@
     @Test
     @Alerts(DEFAULT = "exception",
             FF60 = "function VREyeParameters() {\n    [native code]\n}")
+    @NotYetImplemented(FF60)
     public void vrEyeParameters() throws Exception {
         test("VREyeParameters");
     }
@@ -10271,6 +10275,7 @@
     @Test
     @Alerts(DEFAULT = "exception",
             FF60 = "function VRFieldOfView() {\n    [native code]\n}")
+    @NotYetImplemented(FF60)
     public void vrFieldOfView() throws Exception {
         test("VRFieldOfView");
     }
@@ -10299,6 +10304,7 @@
     @Test
     @Alerts(DEFAULT = "exception",
             FF60 = "function VRPose() {\n    [native code]\n}")
+    @NotYetImplemented(FF60)
     public void vrPose() throws Exception {
         test("VRPose");
     }
@@ -10318,6 +10324,7 @@
     @Test
     @Alerts(DEFAULT = "exception",
             FF60 = "function VRStageParameters() {\n    [native code]\n}")
+    @NotYetImplemented(FF60)
     public void vrStageParameters() throws Exception {
         test("VRStageParameters");
     }

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

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

Revision: 15368
          http://sourceforge.net/p/htmlunit/code/15368
Author:   rbri
Date:     2018-06-20 07:02:52 +0000 (Wed, 20 Jun 2018)
Log Message:
-----------
ff60 support (wip)

Modified Paths:
--------------
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java

Property Changed:
----------------
    trunk/htmlunit/src/test/resources/com/gargoylesoftware/htmlunit/javascript/host/css/property/ElementOffsetHeightTest.properties.FF60.txt

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java	2018-06-20 06:59:19 UTC (rev 15367)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java	2018-06-20 07:02:52 UTC (rev 15368)
@@ -385,7 +385,7 @@
     HTMLIMAGE_BLANK_SRC_AS_EMPTY,
 
     /** Empty src attribute sets display to false. */
-    @BrowserFeature({IE, FF52})
+    @BrowserFeature({IE, FF})
     HTMLIMAGE_EMPTY_SRC_DISPLAY_FALSE,
 
     /** Is document.cretaeElement('image') an HTMLElement. */

Index: trunk/htmlunit/src/test/resources/com/gargoylesoftware/htmlunit/javascript/host/css/property/ElementOffsetHeightTest.properties.FF60.txt
===================================================================
--- trunk/htmlunit/src/test/resources/com/gargoylesoftware/htmlunit/javascript/host/css/property/ElementOffsetHeightTest.properties.FF60.txt	2018-06-20 06:59:19 UTC (rev 15367)
+++ trunk/htmlunit/src/test/resources/com/gargoylesoftware/htmlunit/javascript/host/css/property/ElementOffsetHeightTest.properties.FF60.txt	2018-06-20 07:02:52 UTC (rev 15368)

Property changes on: trunk/htmlunit/src/test/resources/com/gargoylesoftware/htmlunit/javascript/host/css/property/ElementOffsetHeightTest.properties.FF60.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property

[HtmlUnit] SVN: [15367] trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ javascript/host/xml/XMLHttpRequestCORSTest.java

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

Revision: 15367
          http://sourceforge.net/p/htmlunit/code/15367
Author:   rbri
Date:     2018-06-20 06:59:19 +0000 (Wed, 20 Jun 2018)
Log Message:
-----------
ff60 support (wip)

Modified Paths:
--------------
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestCORSTest.java

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestCORSTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestCORSTest.java	2018-06-20 06:56:40 UTC (rev 15366)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestCORSTest.java	2018-06-20 06:59:19 UTC (rev 15367)
@@ -594,8 +594,7 @@
      * @throws Exception if the test fails.
      */
     @Test
-    @Alerts(DEFAULT = {"false", "true", "false", "true"},
-            FF60 = {"false", "true", "false", "ex: open", "true"})
+    @Alerts({"false", "true", "false", "true"})
     public void withCredentials_setBeforeOpenSync() throws Exception {
         final String html = "<html><head>\n"
                 + "<script>\n"
@@ -675,8 +674,7 @@
      * @throws Exception if the test fails.
      */
     @Test
-    @Alerts(DEFAULT = {"false", "false", "true", "false"},
-            FF60 = {"false", "false", "ex: withCredentials=true", "ex: withCredentials=false"})
+    @Alerts({"false", "false", "true", "false"})
     public void withCredentials_setAfterOpenSync() throws Exception {
         final String html = "<html><head>\n"
                 + "<script>\n"
@@ -709,8 +707,7 @@
      * @throws Exception if the test fails.
      */
     @Test
-    @Alerts(DEFAULT = {"false", "false", "true", "false"},
-            FF60 = {"false", "false", "ex: withCredentials=true", "ex: withCredentials=false"})
+    @Alerts({"false", "false", "true", "false"})
     public void withCredentials_setAfterOpenAsync() throws Exception {
         final String html = "<html><head>\n"
                 + "<script>\n"

[HtmlUnit] SVN: [15366] trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ html/HtmlSearchInputTest.java

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

Revision: 15366
          http://sourceforge.net/p/htmlunit/code/15366
Author:   rbri
Date:     2018-06-20 06:56:40 +0000 (Wed, 20 Jun 2018)
Log Message:
-----------
ff60 support (wip)

Modified Paths:
--------------
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlSearchInputTest.java

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlSearchInputTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlSearchInputTest.java	2018-06-20 06:52:37 UTC (rev 15365)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlSearchInputTest.java	2018-06-20 06:56:40 UTC (rev 15366)
@@ -17,6 +17,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.openqa.selenium.By;
+import org.openqa.selenium.Keys;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 
@@ -42,13 +43,13 @@
         final WebElement input = webDriver.findElement(By.id("t"));
         input.sendKeys("abc");
         assertEquals("abc", input.getAttribute("value"));
-        input.sendKeys("\b");
+        input.sendKeys(Keys.BACK_SPACE);
         assertEquals("ab", input.getAttribute("value"));
-        input.sendKeys("\b");
+        input.sendKeys(Keys.BACK_SPACE);
         assertEquals("a", input.getAttribute("value"));
-        input.sendKeys("\b");
+        input.sendKeys(Keys.BACK_SPACE);
         assertEquals("", input.getAttribute("value"));
-        input.sendKeys("\b");
+        input.sendKeys(Keys.BACK_SPACE);
         assertEquals("", input.getAttribute("value"));
     }
 }

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

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

Revision: 15365
          http://sourceforge.net/p/htmlunit/code/15365
Author:   rbri
Date:     2018-06-20 06:52:37 +0000 (Wed, 20 Jun 2018)
Log Message:
-----------
ff60 support (wip)

Modified Paths:
--------------
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/performance/PerformanceTiming.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/performance/PerformanceTimingTest.java

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/performance/PerformanceTiming.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/performance/PerformanceTiming.java	2018-06-20 06:48:47 UTC (rev 15364)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/performance/PerformanceTiming.java	2018-06-20 06:52:37 UTC (rev 15365)
@@ -17,6 +17,7 @@
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.EDGE;
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
 
 import com.gargoylesoftware.htmlunit.javascript.SimpleScriptable;
 import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
@@ -131,7 +132,7 @@
     /**
      * @return a secureConnectionStart
      */
-    @JsxGetter(CHROME)
+    @JsxGetter({CHROME, FF60})
     public long getSecureConnectionStart() {
         return 0;
     }

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/performance/PerformanceTimingTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/performance/PerformanceTimingTest.java	2018-06-20 06:48:47 UTC (rev 15364)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/performance/PerformanceTimingTest.java	2018-06-20 06:52:37 UTC (rev 15365)
@@ -87,7 +87,8 @@
      */
     @Test
     @Alerts(DEFAULT = "undefined",
-            CHROME = "0")
+            CHROME = "0",
+            FF60 = "0")
     public void secureConnectionStart() throws Exception {
         final String html =
                 HtmlPageTest.STANDARDS_MODE_PREFIX_

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

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

Revision: 15364
          http://sourceforge.net/p/htmlunit/code/15364
Author:   rbri
Date:     2018-06-20 06:48:47 +0000 (Wed, 20 Jun 2018)
Log Message:
-----------
ff60 support (wip)

Modified Paths:
--------------
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlApplet2Test.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFileInputTest.java

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java	2018-06-20 06:19:39 UTC (rev 15363)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java	2018-06-20 06:48:47 UTC (rev 15364)
@@ -286,7 +286,6 @@
         FIREFOX_60.registerUploadMimeType("opus", "audio/ogg");
         FIREFOX_60.registerUploadMimeType("webm", "video/webm");
         FIREFOX_60.registerUploadMimeType("wav", "audio/wav");
-        FIREFOX_60.registerUploadMimeType("flac", "audio/x-flac");
         FIREFOX_60.registerUploadMimeType("xhtml", "application/xhtml+xml");
         FIREFOX_60.registerUploadMimeType("xht", "application/xhtml+xml");
         FIREFOX_60.registerUploadMimeType("txt", "text/plain");

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java	2018-06-20 06:19:39 UTC (rev 15363)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java	2018-06-20 06:48:47 UTC (rev 15364)
@@ -417,11 +417,11 @@
     HTMLINPUT_FILES_UNDEFINED,
 
     /** HTMLInputElement: type {@code file} selectionSart/End are null. */
-    @BrowserFeature({CHROME, FF52})
+    @BrowserFeature({CHROME, FF})
     HTMLINPUT_FILE_SELECTION_START_END_NULL,
 
     /** HTMLInputElement: type {@code file} value to be {@code fakepath}. */
-    @BrowserFeature({CHROME, IE})
+    @BrowserFeature({CHROME, FF60, IE})
     HTMLINPUT_FILE_VALUE_FAKEPATH,
 
     /** Should the HTMLElement of {@code keygen} have no end tag. */

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlApplet2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlApplet2Test.java	2018-06-20 06:19:39 UTC (rev 15363)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlApplet2Test.java	2018-06-20 06:48:47 UTC (rev 15364)
@@ -39,7 +39,8 @@
      */
     @Test
     @Alerts(DEFAULT = {"[object HTMLAppletElement]", "[object HTMLCollection]", "1", "[object HTMLAppletElement]"},
-            CHROME = {"[object HTMLUnknownElement]", "[object HTMLCollection]", "0", "undefined"})
+            CHROME = {"[object HTMLUnknownElement]", "[object HTMLCollection]", "0", "undefined"},
+            FF60 = {"[object HTMLUnknownElement]", "[object NodeList]", "0", "undefined"})
     public void simpleScriptable() throws Exception {
         final String html = "<html><head>\n"
             + "<script>\n"

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFileInputTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFileInputTest.java	2018-06-20 06:19:39 UTC (rev 15363)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFileInputTest.java	2018-06-20 06:48:47 UTC (rev 15364)
@@ -254,10 +254,8 @@
      * @throws Exception if an error occurs
      */
     @Test
-    @Alerts(DEFAULT = {"CONTENT_TYPE:audio/flac", "charset"},
-            FF60 = {"CONTENT_TYPE:audio/x-flac", "charset"},
-            FF52 = {"CONTENT_TYPE:application/octet-stream", "charset"},
-            IE = {"CONTENT_TYPE:application/octet-stream", "charset"})
+    @Alerts(DEFAULT = {"CONTENT_TYPE:application/octet-stream", "charset"},
+            CHROME = {"CONTENT_TYPE:audio/flac", "charset"})
     public void contentTypeFlac() throws Exception {
         contentType("flac");
     }
@@ -827,9 +825,8 @@
      * @throws Exception if an error occurs
      */
     @Test
-    @Alerts(DEFAULT = {"ex start", "ex end", "exception"},
-            CHROME = {"null", "null", "0"},
-            FF52 = {"null", "null", "0"})
+    @Alerts(DEFAULT = {"null", "null", "0"},
+            IE = {"ex start", "ex end", "exception"})
     public void selection() throws Exception {
         final String html =
               "<html><head><script>\n"
@@ -864,9 +861,6 @@
     @Alerts(DEFAULT = {"null,null", "exception value", "null,null",
                         "exception", "null,null",
                         "exception", "null,null"},
-            FF60 = {"exception", "exception value", "exception",
-                        "exception", "exception",
-                        "exception", "exception"},
             IE = {"exception", "exception",
                         "exception", "exception",
                         "exception", "exception"})
@@ -881,9 +875,6 @@
     @Alerts(DEFAULT = {"null,null", "exception value", "null,null",
                         "exception", "null,null",
                         "exception", "null,null"},
-            FF60 = {"exception", "exception value", "exception",
-                        "exception", "exception",
-                        "exception", "exception"},
             IE = {"exception", "exception",
                         "exception", "exception",
                         "exception", "exception"})
@@ -898,9 +889,6 @@
     @Alerts(DEFAULT = {"null,null", "exception value", "null,null",
                         "exception", "null,null",
                         "exception", "null,null"},
-            FF60 = {"exception", "exception value", "exception",
-                        "exception", "exception",
-                        "exception", "exception"},
             IE = {"exception", "exception",
                         "exception", "exception",
                         "exception", "exception"})
@@ -949,9 +937,8 @@
      * @throws Exception if test fails
      */
     @Test
-    @Alerts(DEFAULT = "exception",
-            CHROME = {"null,null", "exception"},
-            FF52 = {"null,null", "exception"})
+    @Alerts(DEFAULT = {"null,null", "exception"},
+            IE = "exception")
     public void selectionOnUpdate() throws Exception {
         final String html = "<html>\n"
             + "<body>\n"
@@ -1033,7 +1020,7 @@
      */
     @Test
     @Alerts(DEFAULT = "C:\\fakepath\\pom.xml--null",
-            FF = "pom.xml--null")
+            FF52 = "pom.xml--null")
     // since 2.28
     // there is an option for IE, for local and trusted sites IE includes the file path
     // because we do not support any IE specific setting we do not send the filename as
@@ -1115,7 +1102,7 @@
      */
     @Test
     @Alerts(DEFAULT = "C:\\fakepath\\pom.xml",
-            FF = "pom.xml")
+            FF52 = "pom.xml")
     // since 2.28
     // there is an option for IE, for local and trusted sites IE includes the file path
     // because we do not support any IE specific setting we do not send the filename as

[HtmlUnit] SVN: [15363] trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit

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

Revision: 15363
          http://sourceforge.net/p/htmlunit/code/15363
Author:   rbri
Date:     2018-06-20 06:19:39 +0000 (Wed, 20 Jun 2018)
Log Message:
-----------
ff60 support (wip)

Modified Paths:
--------------
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/ClickableElement2Test.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlTextInputTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/EventTest.java

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/ClickableElement2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/ClickableElement2Test.java	2018-06-20 06:12:12 UTC (rev 15362)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/ClickableElement2Test.java	2018-06-20 06:19:39 UTC (rev 15363)
@@ -15,7 +15,7 @@
 package com.gargoylesoftware.htmlunit.html;
 
 import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.CHROME;
-import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.FF;
+import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.FF52;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -64,7 +64,7 @@
      */
     @Test
     @Alerts("click click dblclick ")
-    @BuggyWebDriver({CHROME, FF})
+    @BuggyWebDriver({CHROME, FF52})
     public void dblClick() throws Exception {
         final String content = "<html>\n"
             + "<head>\n"

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlTextInputTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlTextInputTest.java	2018-06-20 06:12:12 UTC (rev 15362)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlTextInputTest.java	2018-06-20 06:19:39 UTC (rev 15363)
@@ -22,6 +22,7 @@
 import org.junit.runner.RunWith;
 import org.openqa.selenium.By;
 import org.openqa.selenium.InvalidElementStateException;
+import org.openqa.selenium.Keys;
 import org.openqa.selenium.NoSuchElementException;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
@@ -66,13 +67,13 @@
         final WebElement t = driver.findElement(By.id("t"));
         t.sendKeys("abc");
         assertEquals("abc", t.getAttribute("value"));
-        t.sendKeys("\b");
+        t.sendKeys(Keys.BACK_SPACE);
         assertEquals("ab", t.getAttribute("value"));
-        t.sendKeys("\b");
+        t.sendKeys(Keys.BACK_SPACE);
         assertEquals("a", t.getAttribute("value"));
-        t.sendKeys("\b");
+        t.sendKeys(Keys.BACK_SPACE);
         assertEquals("", t.getAttribute("value"));
-        t.sendKeys("\b");
+        t.sendKeys(Keys.BACK_SPACE);
         assertEquals("", t.getAttribute("value"));
     }
 

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/EventTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/EventTest.java	2018-06-20 06:12:12 UTC (rev 15362)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/EventTest.java	2018-06-20 06:19:39 UTC (rev 15363)
@@ -14,7 +14,6 @@
  */
 package com.gargoylesoftware.htmlunit.javascript.host.event;
 
-import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.FF;
 import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.IE;
 
 import org.junit.Test;
@@ -742,10 +741,9 @@
      */
     @Test
     @Alerts(DEFAULT = {"activeElement BODY"},
-            FF = {"activeElement BODY", "focus #document", "handler: activeElement BODY"},
             IE = {"activeElement BODY", "focus BODY", "handler: activeElement BODY"})
     // http://code.google.com/p/selenium/issues/detail?id=4665
-    @NotYetImplemented({FF, IE})
+    @NotYetImplemented(IE)
     public void document_focus() throws Exception {
         final String html = "<html>\n"
                 + "<head>\n"

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

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

Revision: 15362
          http://sourceforge.net/p/htmlunit/code/15362
Author:   rbri
Date:     2018-06-20 06:12:12 +0000 (Wed, 20 Jun 2018)
Log Message:
-----------
more ff60 expectations

Modified Paths:
--------------
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlPasswordInputTest.java

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java	2018-06-20 06:02:23 UTC (rev 15361)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java	2018-06-20 06:12:12 UTC (rev 15362)
@@ -963,8 +963,8 @@
     @BrowserFeature({CHROME, FF52})
     JS_INNER_TEXT_VALUE_NULL,
 
-    /** Chrome ignores negative selection starts. */
-    @BrowserFeature(CHROME)
+    /** Ignore negative selection starts. */
+    @BrowserFeature({CHROME, FF60})
     JS_INPUT_IGNORE_NEGATIVE_SELECTION_START,
 
     /** Chrome/FF returns null for selectionStart/selectionEnd. */

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlPasswordInputTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlPasswordInputTest.java	2018-06-20 06:02:23 UTC (rev 15361)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlPasswordInputTest.java	2018-06-20 06:12:12 UTC (rev 15362)
@@ -22,6 +22,7 @@
 import org.junit.runner.RunWith;
 import org.openqa.selenium.By;
 import org.openqa.selenium.InvalidElementStateException;
+import org.openqa.selenium.Keys;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.htmlunit.HtmlUnitDriver;
@@ -67,13 +68,13 @@
         final WebElement p = driver.findElement(By.id("p"));
         p.sendKeys("abc");
         assertEquals("abc", p.getAttribute("value"));
-        p.sendKeys("\b");
+        p.sendKeys(Keys.BACK_SPACE);
         assertEquals("ab", p.getAttribute("value"));
-        p.sendKeys("\b");
+        p.sendKeys(Keys.BACK_SPACE);
         assertEquals("a", p.getAttribute("value"));
-        p.sendKeys("\b");
+        p.sendKeys(Keys.BACK_SPACE);
         assertEquals("", p.getAttribute("value"));
-        p.sendKeys("\b");
+        p.sendKeys(Keys.BACK_SPACE);
         assertEquals("", p.getAttribute("value"));
     }
 

[HtmlUnit] SVN: [15361] trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit

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

Revision: 15361
          http://sourceforge.net/p/htmlunit/code/15361
Author:   rbri
Date:     2018-06-20 06:02:23 +0000 (Wed, 20 Jun 2018)
Log Message:
-----------
more ff60 expectations

Modified Paths:
--------------
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFrame2Test.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlImage2Test.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlSelect2Test.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestTest.java

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFrame2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFrame2Test.java	2018-06-19 06:21:08 UTC (rev 15360)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFrame2Test.java	2018-06-20 06:02:23 UTC (rev 15361)
@@ -99,7 +99,9 @@
     @Alerts(DEFAULT = "second [object HTMLFormElement] third [object HTMLFormElement] "
                         + "parent [object HTMLFormElement]",
             CHROME = "second undefined third [object HTMLFormElement] "
-                        + "parent [object HTMLFormElement]")
+                        + "parent [object HTMLFormElement]",
+            FF60 = "second undefined third [object HTMLFormElement] "
+                    + "parent [object HTMLFormElement]")
     // real FF sometimes alerts 'third' before 'second'
     @NotYetImplemented(CHROME)
     public void postponeLoading() throws Exception {

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlImage2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlImage2Test.java	2018-06-19 06:21:08 UTC (rev 15360)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlImage2Test.java	2018-06-20 06:02:23 UTC (rev 15361)
@@ -150,9 +150,8 @@
      * @throws Exception if an error occurs
      */
     @Test
-    @Alerts(DEFAULT = "true",
-            CHROME = "false",
-            FF52 = "false")
+    @Alerts(DEFAULT = "false",
+            IE = "true")
     public void isDisplayedEmptySource() throws Exception {
         isDisplayed("src=''");
     }

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlSelect2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlSelect2Test.java	2018-06-19 06:21:08 UTC (rev 15360)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlSelect2Test.java	2018-06-20 06:02:23 UTC (rev 15361)
@@ -14,7 +14,7 @@
  */
 package com.gargoylesoftware.htmlunit.html;
 
-import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.FF;
+import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.FF52;
 import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.IE;
 
 import java.util.List;
@@ -44,7 +44,7 @@
      * @exception Exception If the test fails
      */
     @Test
-    @BuggyWebDriver({FF, IE})
+    @BuggyWebDriver({FF52, IE})
     public void select() throws Exception {
         final String html = "<html><head><title>foo</title></head><body>\n"
             + "<form id='form1'><select name='select1' multiple>\n"
@@ -113,7 +113,7 @@
      * @exception Exception If the test fails
      */
     @Test
-    @BuggyWebDriver({FF, IE})
+    @BuggyWebDriver({FF52, IE})
     public void controlClick() throws Exception {
         final String html = "<html><head><title>foo</title></head><body>\n"
             + "<form id='form1'><select name='select1' multiple>\n"

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestTest.java	2018-06-19 06:21:08 UTC (rev 15360)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestTest.java	2018-06-20 06:02:23 UTC (rev 15361)
@@ -687,8 +687,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(DEFAULT = {"true", "exception"},
-            FF60 = {"true", "overwritten"})
+    @Alerts({"true", "exception"})
     public void overrideMimeTypeAfterSend() throws Exception {
         final String html = "<html><head>\n"
             + "<script>\n"
@@ -1397,9 +1396,8 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(DEFAULT = {"someLoad [object ProgressEvent]", "load", "true"},
-            CHROME = {"someLoad [object ProgressEvent]", "load", "false"},
-            FF52 = {"someLoad [object ProgressEvent]", "load", "false"})
+    @Alerts(DEFAULT = {"someLoad [object ProgressEvent]", "load", "false"},
+            IE = {"someLoad [object ProgressEvent]", "load", "true"})
     public void addEventListener() throws Exception {
         final String html =
               "<html>\n"
@@ -1434,9 +1432,8 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(DEFAULT = {"someLoad [object ProgressEvent]", "load", "true", "11", "11"},
-            CHROME = {"someLoad [object ProgressEvent]", "load", "false", "11", "0"},
-            FF52 = {"someLoad [object ProgressEvent]", "load", "false", "11", "0"})
+    @Alerts(DEFAULT = {"someLoad [object ProgressEvent]", "load", "false", "11", "0"},
+            IE = {"someLoad [object ProgressEvent]", "load", "true", "11", "11"})
     public void addEventListenerDetails() throws Exception {
         final String html =
               "<html>\n"
@@ -1473,9 +1470,8 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(DEFAULT = "null",
-            CHROME = "function",
-            FF52 = "function")
+    @Alerts(DEFAULT = "function",
+            IE = "null")
     @NotYetImplemented
     public void addEventListenerCaller() throws Exception {
         final String html =
@@ -1579,11 +1575,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(DEFAULT = {"[object Object]", "undefined", "undefined",
-                        "function onreadystatechange() {\n    [native code]\n}",
-                        "function onreadystatechange() {\n    [native code]\n}",
-                        "true", "true"},
-            FF52 = {"[object Object]", "undefined", "undefined",
+    @Alerts(FF = {"[object Object]", "undefined", "undefined",
                         "function get onreadystatechange() {\n    [native code]\n}",
                         "function set onreadystatechange() {\n    [native code]\n}",
                         "true", "true"},
@@ -1626,12 +1618,12 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(DEFAULT = {"[object Object]", "undefined", "undefined",
+    @Alerts(FF52 = {"[object Object]", "undefined", "undefined",
                         "function () { return !0 }",
-                        "function onreadystatechange() {\n    [native code]\n}",
+                        "function set onreadystatechange() {\n    [native code]\n}",
                         "true", "true"},
-            FF52 = {"[object Object]", "undefined", "undefined",
-                        "function () { return !0 }",
+            FF60 = {"[object Object]", "undefined", "undefined",
+                        "function() { return !0 }",
                         "function set onreadystatechange() {\n    [native code]\n}",
                         "true", "true"},
             CHROME = {"[object Object]", "undefined", "undefined",

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

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

Revision: 15360
          http://sourceforge.net/p/htmlunit/code/15360
Author:   rbri
Date:     2018-06-19 06:21:08 +0000 (Tue, 19 Jun 2018)
Log Message:
-----------
ff60 support (wip)

Modified Paths:
--------------
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Selection.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTextAreaElement.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlTextArea2Test.java

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Selection.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Selection.java	2018-06-19 06:10:51 UTC (rev 15359)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Selection.java	2018-06-19 06:21:08 UTC (rev 15360)
@@ -17,6 +17,7 @@
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.EDGE;
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -147,7 +148,7 @@
      * Returns the type of selection (IE only).
      * @return the type of selection
      */
-    @JsxGetter(CHROME)
+    @JsxGetter({CHROME, FF60})
     public String getType() {
         return type_;
     }

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTextAreaElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTextAreaElement.java	2018-06-19 06:10:51 UTC (rev 15359)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTextAreaElement.java	2018-06-19 06:21:08 UTC (rev 15360)
@@ -24,6 +24,7 @@
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.EDGE;
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
 
 import com.gargoylesoftware.htmlunit.html.HtmlTextArea;
@@ -374,7 +375,7 @@
      * Returns the labels associated with the element.
      * @return the labels associated with the element
      */
-    @JsxGetter(CHROME)
+    @JsxGetter({CHROME, FF60})
     public AbstractList getLabels() {
         if (labels_ == null) {
             labels_ = new LabelsHelper(getDomNodeOrDie());

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlTextArea2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlTextArea2Test.java	2018-06-19 06:10:51 UTC (rev 15359)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlTextArea2Test.java	2018-06-19 06:21:08 UTC (rev 15360)
@@ -23,9 +23,10 @@
 import com.gargoylesoftware.htmlunit.BrowserRunner;
 import com.gargoylesoftware.htmlunit.BrowserRunner.Alerts;
 import com.gargoylesoftware.htmlunit.WebDriverTestCase;
+import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLTextAreaElement;
 
 /**
- * Tests for {@link HtmlTextInput}.
+ * Tests for {@link HTMLTextAreaElement}.
  *
  * @author Ronald Brill
  * @author Ahmed Ashour

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

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

Revision: 15359
          http://sourceforge.net/p/htmlunit/code/15359
Author:   rbri
Date:     2018-06-19 06:10:51 +0000 (Tue, 19 Jun 2018)
Log Message:
-----------
ff60 support (wip)

Modified Paths:
--------------
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/file/File.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLButtonElement.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLProgressElement.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/file/FileTest.java

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/file/File.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/file/File.java	2018-06-19 05:58:09 UTC (rev 15358)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/file/File.java	2018-06-19 06:10:51 UTC (rev 15359)
@@ -18,7 +18,6 @@
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.EDGE;
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF52;
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
 
 import java.util.Date;
@@ -98,7 +97,7 @@
      * Returns the {@code webkitRelativePath} property.
      * @return the {@code webkitRelativePath} property
      */
-    @JsxGetter({CHROME, FF52})
+    @JsxGetter({CHROME, FF})
     public String getWebkitRelativePath() {
         return "";
     }

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLButtonElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLButtonElement.java	2018-06-19 05:58:09 UTC (rev 15358)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLButtonElement.java	2018-06-19 06:10:51 UTC (rev 15359)
@@ -17,6 +17,7 @@
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.EDGE;
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
 
 import java.util.Locale;
@@ -89,7 +90,7 @@
      * Returns the labels associated with the element.
      * @return the labels associated with the element
      */
-    @JsxGetter(CHROME)
+    @JsxGetter({CHROME, FF60})
     public AbstractList getLabels() {
         if (labels_ == null) {
             labels_ = new LabelsHelper(getDomNodeOrDie());

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLProgressElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLProgressElement.java	2018-06-19 05:58:09 UTC (rev 15358)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLProgressElement.java	2018-06-19 06:10:51 UTC (rev 15359)
@@ -17,6 +17,7 @@
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.EDGE;
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
 
 import com.gargoylesoftware.htmlunit.html.HtmlProgress;
 import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
@@ -76,7 +77,7 @@
      * Returns the labels associated with the element.
      * @return the labels associated with the element
      */
-    @JsxGetter(CHROME)
+    @JsxGetter({CHROME, FF60})
     public AbstractList getLabels() {
         if (labels_ == null) {
             labels_ = new LabelsHelper(getDomNodeOrDie());

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/file/FileTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/file/FileTest.java	2018-06-19 05:58:09 UTC (rev 15358)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/file/FileTest.java	2018-06-19 06:10:51 UTC (rev 15359)
@@ -30,7 +30,7 @@
 import com.gargoylesoftware.htmlunit.html.HtmlPageTest;
 
 /**
- * Tests for {@link File}.
+ * Tests for {@link com.gargoylesoftware.htmlunit.javascript.host.file.File}.
  *
  * @author Ronald Brill
  */

[HtmlUnit] SVN: [15358] trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit

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

Revision: 15358
          http://sourceforge.net/p/htmlunit/code/15358
Author:   rbri
Date:     2018-06-19 05:58:09 +0000 (Tue, 19 Jun 2018)
Log Message:
-----------
ff60 support (wip)

Modified Paths:
--------------
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/intl/DateTimeFormat.java

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java	2018-06-18 19:15:15 UTC (rev 15357)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java	2018-06-19 05:58:09 UTC (rev 15358)
@@ -752,7 +752,7 @@
     JS_DOMIMPLEMENTATION_FEATURE_STYLESHEETS,
 
     /** If document.implementation.hasFeature() supports 'http://www.w3.org/TR/SVG11/feature#BasicStructure 1.2'. */
-    @BrowserFeature({CHROME, FF52})
+    @BrowserFeature({CHROME, FF})
     JS_DOMIMPLEMENTATION_FEATURE_SVG_BASICSTRUCTURE_1_2,
 
     /** If document.implementation.hasFeature() supports 'MutationNameEvents'. */

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/intl/DateTimeFormat.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/intl/DateTimeFormat.java	2018-06-18 19:15:15 UTC (rev 15357)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/intl/DateTimeFormat.java	2018-06-19 05:58:09 UTC (rev 15358)
@@ -113,6 +113,7 @@
         commonFormats.put("it", ddSlash);
         commonFormats.put("iw", ddDot);
         commonFormats.put("ja", yyyySlash);
+        commonFormats.put("ja-JP-u-ca-japanese", "yy/MM/dd");
         commonFormats.put("ko", yyyyDotBlankDot);
         commonFormats.put("lt", yyyyDash);
         commonFormats.put("lv", yyyyDotDot);
@@ -145,7 +146,6 @@
         commonFormats.put("es-US", ddSlash);
         commonFormats.put("ga", ddSlash);
         commonFormats.put("fr-CH", ddDot);
-        commonFormats.put("ja-JP-u-ca-japanese", "yy/MM/dd");
         commonFormats.put("mt", ddSlash);
         commonFormats.put("nl-BE", ddSlash);
         commonFormats.put("sk", ddDotBlank);
@@ -169,7 +169,6 @@
         CHROME_FORMATS_.put("in-ID", ddSlash);
         CHROME_FORMATS_.put("is", yyyyDash);
         CHROME_FORMATS_.put("iw", ddDot);
-        CHROME_FORMATS_.put("ja-JP-u-ca-japanese", "平成yy/MM/dd");
         CHROME_FORMATS_.put("mk", yyyyDash);
         CHROME_FORMATS_.put("nl-BE", ddSlash);
         CHROME_FORMATS_.put("sk", ddDotBlank);