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

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"


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot