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

rbri--- via HtmlUnit-develop <[email protected]>
Newsgroups gmane.comp.java.htmlunit.devel
Message-ID <[email protected]>
Revision: 15292
          http://sourceforge.net/p/htmlunit/code/15292
Author:   rbri
Date:     2018-05-27 11:29:11 +0000 (Sun, 27 May 2018)
Log Message:
-----------


Modified Paths:
--------------
    trunk/htmlunit/src/changes/changes.xml
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/AbstractJavaScriptConfiguration.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/SupportedBrowser.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/WebGL2RenderingContext.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/WebGLRenderingContext.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclaration.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/MozCSSKeyframesRule.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DOMSettableTokenList.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Document.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DocumentType.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Node.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/MozContactChangeEvent.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/MozSettingsEvent.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/geo/Geolocation.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLContentElement.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElement.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLShadowElement.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/moz/MozPowerManager.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGAltGlyphElement.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGDocument.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGElement.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserParameterizedRunner.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserRunner.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersion2Test.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersionFeaturesTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersionTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/CodeStyleTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/HttpWebConnection3Test.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/NotYetImplementedTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebClientTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebDriverTestCase.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/ElementDefaultStyleDisplayTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/ElementPropertiesTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/HostClassNameTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/HostTypeOfTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFileInputTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/DebugFrameImplTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine2Test.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/NativeArrayTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/NativeStringTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/configuration/JavaScriptConfigurationTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/History2Test.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Location2Test.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/MapTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/NamedNodeMapTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/NavigatorTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/SetTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/SymbolTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/URLSearchParamsTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Window2Test.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/WindowConcurrencyTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/ArrayBufferTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Float32ArrayTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Float64ArrayTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Int16ArrayTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Int32ArrayTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Int8ArrayTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Uint16ArrayTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Uint32ArrayTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Uint8ArrayTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Uint8ClampedArrayTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/CanvasRenderingContext2DTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSKeyframesRuleTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSRuleListTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/StyleAttributesIterableTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/property/ElementClientWidthTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/property/ElementOffsetWidthTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DOMParserTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DOMTokenListTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DocumentTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DocumentTypeTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/NodeListTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/NodeTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/MessageEventTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/PopStateEventTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/WebGLContextEventTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/file/FileTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLCanvasElementTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElementTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLImageElementTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLSelectElementTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTextAreaElementTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/intl/DateTimeFormatTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestCORSTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/regexp/HtmlUnitRegExpProxy3Test.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/runners/BrowserStatement.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/runners/BrowserVersionClassRunner.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/runners/TestCaseCorrector.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgAltGlyphTest.java

Modified: trunk/htmlunit/src/changes/changes.xml
===================================================================
--- trunk/htmlunit/src/changes/changes.xml	2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/changes/changes.xml	2018-05-27 11:29:11 UTC (rev 15292)
@@ -7,7 +7,7 @@
     </properties>
 
     <body>
-        <release version="2.32" date="xx 2018" description="Bugfixes">
+        <release version="2.32" date="xx 2018" description="Bugfixes, FIREFOX_45 removed, FIREFOX_60 added">
             <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/BrowserVersion.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java	2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java	2018-05-27 11:29:11 UTC (rev 15292)
@@ -93,12 +93,10 @@
     private static final String PLATFORM_WIN64 = "Win64";
 
     /**
-     * Firefox 45 ESR.
-     * @since 2.21
-     * @deprecated As of 2.31
+     * Firefox 60 ESR.
+     * @since 2,.32
      */
-    @Deprecated
-    public static final BrowserVersion FIREFOX_45 = new BrowserVersion(45, "FF45");
+    public static final BrowserVersion FIREFOX_60 = new BrowserVersion(45, "FF60");
 
     /**
      * Firefox 52 ESR.
@@ -125,13 +123,13 @@
 
     /** Register plugins for the browser versions. */
     static {
-        // FF45
-        FIREFOX_45.applicationVersion_ = "5.0 (Windows)";
-        FIREFOX_45.userAgent_ = "Mozilla/5.0 (Windows NT 6.1; rv:45.0) Gecko/20100101 Firefox/45.0";
-        FIREFOX_45.platform_ = PLATFORM_WIN32;
-        FIREFOX_45.buildId_ = "20170411115307";
-        FIREFOX_45.productSub_ = "20100101";
-        FIREFOX_45.headerNamesOrdered_ = new String[] {
+        // FF60
+        FIREFOX_60.applicationVersion_ = "5.0 (Windows)";
+        FIREFOX_60.userAgent_ = "Mozilla/5.0 (Windows NT 6.1; rv:45.0) Gecko/20100101 Firefox/45.0";
+        FIREFOX_60.platform_ = PLATFORM_WIN32;
+        FIREFOX_60.buildId_ = "20170411115307";
+        FIREFOX_60.productSub_ = "20100101";
+        FIREFOX_60.headerNamesOrdered_ = new String[] {
             HttpHeader.HOST,
             HttpHeader.USER_AGENT,
             HttpHeader.ACCEPT,
@@ -140,11 +138,11 @@
             HttpHeader.REFERER,
             HttpHeader.COOKIE,
             HttpHeader.CONNECTION};
-        FIREFOX_45.htmlAcceptHeader_ = "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";
-        FIREFOX_45.xmlHttpRequestAcceptHeader_ = "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";
-        FIREFOX_45.imgAcceptHeader_ = "image/png,image/*;q=0.8,*/*;q=0.5";
-        FIREFOX_45.cssAcceptHeader_ = "text/css,*/*;q=0.1";
-        FIREFOX_45.fontHeights_ = new int[] {
+        FIREFOX_60.htmlAcceptHeader_ = "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";
+        FIREFOX_60.xmlHttpRequestAcceptHeader_ = "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";
+        FIREFOX_60.imgAcceptHeader_ = "image/png,image/*;q=0.8,*/*;q=0.5";
+        FIREFOX_60.cssAcceptHeader_ = "text/css,*/*;q=0.1";
+        FIREFOX_60.fontHeights_ = new int[] {
             0, 3, 4, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 16, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
             30, 31, 32, 33, 34, 35, 36, 37, 38, 40, 41, 42, 43, 44, 45, 46, 47, 48, 50, 51, 52, 53, 53, 55, 57, 58,
             59, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 72, 73, 74, 75, 76, 77, 78, 79, 80, 82, 84, 85, 86, 87, 88,
@@ -271,29 +269,29 @@
         CHROME.registerUploadMimeType("txt", "text/plain");
         CHROME.registerUploadMimeType("text", "text/plain");
 
-        FIREFOX_45.registerUploadMimeType("html", "text/html");
-        FIREFOX_45.registerUploadMimeType("htm", "text/html");
-        FIREFOX_45.registerUploadMimeType("css", "text/css");
-        FIREFOX_45.registerUploadMimeType("xml", "text/xml");
-        FIREFOX_45.registerUploadMimeType("gif", "image/gif");
-        FIREFOX_45.registerUploadMimeType("jpeg", "image/jpeg");
-        FIREFOX_45.registerUploadMimeType("jpg", "image/jpeg");
-        FIREFOX_45.registerUploadMimeType("mp4", "video/mp4");
-        FIREFOX_45.registerUploadMimeType("m4v", "video/mp4");
-        FIREFOX_45.registerUploadMimeType("m4a", "audio/mp4");
-        FIREFOX_45.registerUploadMimeType("mp3", "audio/mpeg");
-        FIREFOX_45.registerUploadMimeType("ogv", "video/ogg");
-        FIREFOX_45.registerUploadMimeType("ogm", "video/x-ogm");
-        FIREFOX_45.registerUploadMimeType("ogg", "video/ogg");
-        FIREFOX_45.registerUploadMimeType("oga", "audio/ogg");
-        FIREFOX_45.registerUploadMimeType("opus", "audio/ogg");
-        FIREFOX_45.registerUploadMimeType("webm", "video/webm");
-        FIREFOX_45.registerUploadMimeType("wav", "audio/wav");
-        FIREFOX_45.registerUploadMimeType("flac", "audio/x-flac");
-        FIREFOX_45.registerUploadMimeType("xhtml", "application/xhtml+xml");
-        FIREFOX_45.registerUploadMimeType("xht", "application/xhtml+xml");
-        FIREFOX_45.registerUploadMimeType("txt", "text/plain");
-        FIREFOX_45.registerUploadMimeType("text", "text/plain");
+        FIREFOX_60.registerUploadMimeType("html", "text/html");
+        FIREFOX_60.registerUploadMimeType("htm", "text/html");
+        FIREFOX_60.registerUploadMimeType("css", "text/css");
+        FIREFOX_60.registerUploadMimeType("xml", "text/xml");
+        FIREFOX_60.registerUploadMimeType("gif", "image/gif");
+        FIREFOX_60.registerUploadMimeType("jpeg", "image/jpeg");
+        FIREFOX_60.registerUploadMimeType("jpg", "image/jpeg");
+        FIREFOX_60.registerUploadMimeType("mp4", "video/mp4");
+        FIREFOX_60.registerUploadMimeType("m4v", "video/mp4");
+        FIREFOX_60.registerUploadMimeType("m4a", "audio/mp4");
+        FIREFOX_60.registerUploadMimeType("mp3", "audio/mpeg");
+        FIREFOX_60.registerUploadMimeType("ogv", "video/ogg");
+        FIREFOX_60.registerUploadMimeType("ogm", "video/x-ogm");
+        FIREFOX_60.registerUploadMimeType("ogg", "video/ogg");
+        FIREFOX_60.registerUploadMimeType("oga", "audio/ogg");
+        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");
+        FIREFOX_60.registerUploadMimeType("text", "text/plain");
 
         FIREFOX_52.registerUploadMimeType("html", "text/html");
         FIREFOX_52.registerUploadMimeType("htm", "text/html");
@@ -359,7 +357,7 @@
                 "Shockwave Flash 29.0 r0", "29.0.0.140", "NPSWF32_29_0_0_140.dll");
         flash.getMimeTypes().add(new PluginConfiguration.MimeType("application/x-shockwave-flash",
                 "Shockwave Flash", "swf"));
-        FIREFOX_45.plugins_.add(flash);
+        FIREFOX_60.plugins_.add(flash);
 
         flash = new PluginConfiguration("Shockwave Flash",
                 "Shockwave Flash 29.0 r0", "29.0.0.140", "NPSWF64_29_0_0_140.dll");
@@ -442,7 +440,7 @@
             expectedBrowser = SupportedBrowser.FF52;
         }
         else if (isFirefox()) {
-            expectedBrowser = SupportedBrowser.FF45;
+            expectedBrowser = SupportedBrowser.FF60;
         }
         else if (isIE()) {
             expectedBrowser = SupportedBrowser.IE;

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java	2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java	2018-05-27 11:29:11 UTC (rev 15292)
@@ -17,7 +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.FF45;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF52;
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
 
@@ -51,7 +51,7 @@
     ANCHOR_IGNORE_TARGET_FOR_JS_HREF,
 
     /** Is the default display style of Applet is 'inline-block'. */
-    @BrowserFeature(FF45)
+    @BrowserFeature(FF60)
     APPLET_INLINE_BLOCK,
 
     /** Background image is 'initial'. */
@@ -433,7 +433,7 @@
     HTMLLINK_CHECK_TYPE_FOR_STYLESHEET,
 
     /** If the single select has exact one option, this options gets never deselected. */
-    @BrowserFeature(FF45)
+    @BrowserFeature(FF60)
     HTMLOPTION_EXACT_ONE_OPTION_GETS_NERVER_DESELECTED,
 
     /** */
@@ -608,7 +608,7 @@
     JS_CANVAS_DATA_URL_IE_PNG,
 
     /** draw for canvas throws an error if no image available. */
-    @BrowserFeature(FF45)
+    @BrowserFeature(FF60)
     JS_CANVAS_DRAW_THROWS_FOR_MISSING_IMG,
 
     /** Do not allow invalid clear values. */
@@ -644,7 +644,7 @@
     JS_CSSRULELIST_ENUM_ITEM_LENGTH,
 
     /** Uses {@code MozCSSKeyframesRule}. */
-    @BrowserFeature(FF45)
+    @BrowserFeature(FF60)
     JS_CSS_MOZ_CSS_KEYFRAMES_RULE,
 
     /** <code>Date.toLocaleDateString()</code> returns a short form (d.M.yyyy). */
@@ -1235,9 +1235,9 @@
     @BrowserFeature({CHROME, FF, EDGE})
     JS_SYMBOL,
 
-    /** Symbol support is limited in FF45. */
-    @BrowserFeature(FF45)
-    JS_SYMBOL_FF45,
+    /** Symbol support is limited in FF60. */
+    @BrowserFeature(FF60)
+    JS_SYMBOL_FF60,
 
     /** The width cell height does not return negative values. */
     @BrowserFeature(IE)
@@ -1290,7 +1290,7 @@
     /** Setting the property cols throws an exception, if the provided value is not convertible into an integer.
      * FF ignores the provided value in this case and sets cols to 0.
      */
-    @BrowserFeature({IE, FF45})
+    @BrowserFeature({IE, FF60})
     JS_TEXT_AREA_SET_COLS_THROWS_EXCEPTION,
 
     /** Setting the property {@code maxLength} throws an exception, if the provided value is less than 0. */
@@ -1304,7 +1304,7 @@
     /** Setting the property rows throws an exception, if the provided value is not convertible into an integer.
      * FF ignores the provided value in this case and sets rows to 0.
      */
-    @BrowserFeature({IE, FF45})
+    @BrowserFeature({IE, FF60})
     JS_TEXT_AREA_SET_ROWS_THROWS_EXCEPTION,
 
     /** Setting the value processes null as null value. */
@@ -1489,7 +1489,7 @@
     SLOT_CONTENTS,
 
     /** Indicates that string.contains() is supported. */
-    @BrowserFeature(FF45)
+    @BrowserFeature(FF60)
     STRING_CONTAINS,
 
     /** Indicates that string.includes() is supported. */
@@ -1541,7 +1541,7 @@
      * Indicates, that the pathname for the url {@code about:blank} is empty;
      * instead of '/blank'.
      */
-    @BrowserFeature(FF45)
+    @BrowserFeature(FF60)
     URL_ABOUT_BLANK_HAS_EMPTY_PATH,
 
     /**
@@ -1581,7 +1581,7 @@
     XHR_IGNORE_PORT_FOR_SAME_ORIGIN,
 
     /** ProgressEvent.lengthComputable is true. */
-    @BrowserFeature({FF45, IE})
+    @BrowserFeature({FF60, IE})
     XHR_LENGTH_COMPUTABLE,
 
     /** A cross origin request to {@code about:blank} is not allowed. */
@@ -1593,7 +1593,7 @@
     XHR_OPEN_ALLOW_EMTPY_URL,
 
     /** Indicates that open() throws an exception in sync mode if 'withCredentials' is set to true. */
-    @BrowserFeature(FF45)
+    @BrowserFeature(FF60)
     XHR_OPEN_WITHCREDENTIALS_TRUE_IN_SYNC_EXCEPTION,
 
     /** Indicates that method overrideMimeType throws if msg was already sent. */
@@ -1616,7 +1616,7 @@
      * Indicates that the property <code>withCredentials</code> is not writable for sync requests.
      * Setting the property throws an exception.
      */
-    @BrowserFeature(FF45)
+    @BrowserFeature(FF60)
     XHR_WITHCREDENTIALS_NOT_WRITEABLE_IN_SYNC_EXCEPTION,
 
     /** Indicates that the XPath attribute is case sensitive. */

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java	2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java	2018-05-27 11:29:11 UTC (rev 15292)
@@ -23,7 +23,7 @@
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_OBJECT_GET_OWN_PROPERTY_SYMBOLS;
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_REFLECT;
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_SYMBOL;
-import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_SYMBOL_FF45;
+import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_SYMBOL_FF60;
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_WINDOW_ACTIVEXOBJECT_HIDDEN;
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_XML;
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.STRING_CONTAINS;
@@ -232,7 +232,7 @@
             deleteProperties(window, "Symbol");
         }
 
-        if (browserVersion.hasFeature(JS_SYMBOL_FF45)) {
+        if (browserVersion.hasFeature(JS_SYMBOL_FF60)) {
             final ScriptableObject sym = (ScriptableObject) ScriptableObject.getProperty(window, "Symbol");
             final List<String> toDelete = Arrays.asList("hasInstance", "isConcatSpreadable", "replace",
                     "search", "split", "string", "toStringTag", "unscopables");

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/AbstractJavaScriptConfiguration.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/AbstractJavaScriptConfiguration.java	2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/AbstractJavaScriptConfiguration.java	2018-05-27 11:29:11 UTC (rev 15292)
@@ -17,7 +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.FF45;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF52;
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
 
@@ -115,7 +115,7 @@
                 expectedBrowser = FF52;
             }
             else if (browser.isFirefox()) {
-                expectedBrowser = FF45;
+                expectedBrowser = FF60;
             }
             else {
                 expectedBrowser = CHROME;  // our current fallback
@@ -330,8 +330,8 @@
      */
     public static boolean isCompatible(final SupportedBrowser browser1, final SupportedBrowser browser2) {
         return (browser1 == browser2)
-                || (browser1 == FF && (browser2 == FF45 || browser2 == FF52))
-                || (browser2 == FF && (browser1 == FF45 || browser1 == FF52));
+                || (browser1 == FF && (browser2 == FF60 || browser2 == FF52))
+                || (browser2 == FF && (browser1 == FF60 || browser1 == FF52));
     }
 
     /**

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/SupportedBrowser.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/SupportedBrowser.java	2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/SupportedBrowser.java	2018-05-27 11:29:11 UTC (rev 15292)
@@ -34,7 +34,7 @@
     FF,
 
     /** Firefox 45. */
-    FF45,
+    FF60,
 
     /** Firefox 52. */
     FF52

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java	2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java	2018-05-27 11:29:11 UTC (rev 15292)
@@ -24,7 +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.FF45;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF52;
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
 
@@ -2650,7 +2650,7 @@
      * Returns the {@code onmozpointerlockchange} event handler.
      * @return the {@code onmozpointerlockchange} event handler
      */
-    @JsxGetter(FF45)
+    @JsxGetter(FF60)
     public Function getOnmozpointerlockchange() {
         return getEventHandler("mozpointerlockchange");
     }
@@ -2659,7 +2659,7 @@
      * Sets the {@code onmozpointerlockchange} event handler.
      * @param onmozpointerlockchange the {@code onmozpointerlockchange} event handler
      */
-    @JsxSetter(FF45)
+    @JsxSetter(FF60)
     public void setOnmozpointerlockchange(final Object onmozpointerlockchange) {
         setHandlerForJavaScript("mozpointerlockchange", onmozpointerlockchange);
     }
@@ -4054,7 +4054,7 @@
      * Returns the {@code onmozpointerlockerror} event handler.
      * @return the {@code onmozpointerlockerror} event handler
      */
-    @JsxGetter(FF45)
+    @JsxGetter(FF60)
     public Function getOnmozpointerlockerror() {
         return getEventHandler("mozpointerlockerror");
     }
@@ -4063,7 +4063,7 @@
      * Sets the {@code onmozpointerlockerror} event handler.
      * @param onmozpointerlockerror the {@code onmozpointerlockerror} event handler
      */
-    @JsxSetter(FF45)
+    @JsxSetter(FF60)
     public void setOnmozpointerlockerror(final Object onmozpointerlockerror) {
         setHandlerForJavaScript("mozpointerlockerror", onmozpointerlockerror);
     }

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/WebGL2RenderingContext.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/WebGL2RenderingContext.java	2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/WebGL2RenderingContext.java	2018-05-27 11:29:11 UTC (rev 15292)
@@ -15,7 +15,7 @@
 package com.gargoylesoftware.htmlunit.javascript.host.canvas;
 
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF45;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF52;
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
 
@@ -1645,7 +1645,7 @@
     public static final long STENCIL_FUNC = 2962L;
 
     /** The constant {@code STENCIL_INDEX}. */
-    @JsxConstant({FF52, FF45, IE})
+    @JsxConstant({FF52, FF60, IE})
     public static final long STENCIL_INDEX = 6401L;
 
     /** The constant {@code STENCIL_INDEX8}. */

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/WebGLRenderingContext.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/WebGLRenderingContext.java	2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/WebGLRenderingContext.java	2018-05-27 11:29:11 UTC (rev 15292)
@@ -17,7 +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.FF45;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF52;
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
 
@@ -340,7 +340,7 @@
     @JsxConstant
     public static final int TEXTURE = 0x1702;
     /** The constant {@code STENCIL_INDEX}. */
-    @JsxConstant({FF52, FF45, IE})
+    @JsxConstant({FF52, FF60, IE})
     public static final int STENCIL_INDEX = 0x1901;
     /** The constant {@code DEPTH_COMPONENT}. */
     @JsxConstant

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclaration.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclaration.java	2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclaration.java	2018-05-27 11:29:11 UTC (rev 15292)
@@ -1066,7 +1066,7 @@
                 if (browserVersion.hasFeature(JS_CLIENTWIDTH_INPUT_TEXT_169)) {
                     return 169;
                 }
-                width = 141; // FF45
+                width = 141; // FF60
             }
             else if (node instanceof HtmlRadioButtonInput || node instanceof HtmlCheckBoxInput) {
                 width = 13;

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/MozCSSKeyframesRule.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/MozCSSKeyframesRule.java	2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/MozCSSKeyframesRule.java	2018-05-27 11:29:11 UTC (rev 15292)
@@ -14,7 +14,7 @@
  */
 package com.gargoylesoftware.htmlunit.javascript.host.css;
 
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF45;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
 
 import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
 
@@ -23,6 +23,6 @@
  *
  * @author Ahmed Ashour
  */
-@JsxClass(FF45)
+@JsxClass(FF60)
 public class MozCSSKeyframesRule extends CSSRule {
 }

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DOMSettableTokenList.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DOMSettableTokenList.java	2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DOMSettableTokenList.java	2018-05-27 11:29:11 UTC (rev 15292)
@@ -16,7 +16,7 @@
 
 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.FF45;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
 
 import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
@@ -27,7 +27,7 @@
  *
  * @author Ahmed Ashour
  */
-@JsxClass({FF45, IE, EDGE})
+@JsxClass({FF60, IE, EDGE})
 public class DOMSettableTokenList extends DOMTokenList {
 
     /**

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Document.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Document.java	2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Document.java	2018-05-27 11:29:11 UTC (rev 15292)
@@ -34,7 +34,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.FF45;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF52;
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
 import static com.gargoylesoftware.htmlunit.util.StringUtils.parseHttpDate;
@@ -3563,7 +3563,7 @@
      * Returns the {@code onmozpointerlockchange} event handler for this element.
      * @return the {@code onmozpointerlockchange} event handler for this element
      */
-    @JsxGetter(FF45)
+    @JsxGetter(FF60)
     public Function getOnmozpointerlockchange() {
         return getEventHandler("mozpointerlockchange");
     }
@@ -3572,7 +3572,7 @@
      * Sets the {@code onmozpointerlockchange} event handler for this element.
      * @param onmozpointerlockchange the {@code onmozpointerlockchange} event handler for this element
      */
-    @JsxSetter(FF45)
+    @JsxSetter(FF60)
     public void setOnmozpointerlockchange(final Object onmozpointerlockchange) {
         setEventHandler("mozpointerlockchange", onmozpointerlockchange);
     }
@@ -3581,7 +3581,7 @@
      * Returns the {@code onmozpointerlockerror} event handler for this element.
      * @return the {@code onmozpointerlockerror} event handler for this element
      */
-    @JsxGetter(FF45)
+    @JsxGetter(FF60)
     public Function getOnmozpointerlockerror() {
         return getEventHandler("mozpointerlockerror");
     }
@@ -3590,7 +3590,7 @@
      * Sets the {@code onmozpointerlockerror} event handler for this element.
      * @param onmozpointerlockerror the {@code onmozpointerlockerror} event handler for this element
      */
-    @JsxSetter(FF45)
+    @JsxSetter(FF60)
     public void setOnmozpointerlockerror(final Object onmozpointerlockerror) {
         setEventHandler("mozpointerlockerror", onmozpointerlockerror);
     }

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DocumentType.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DocumentType.java	2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DocumentType.java	2018-05-27 11:29:11 UTC (rev 15292)
@@ -19,7 +19,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.FF45;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
 
 import org.apache.commons.lang3.StringUtils;
@@ -141,7 +141,7 @@
      * {@inheritDoc}
      */
     @Override
-    @JsxGetter(FF45)
+    @JsxGetter(FF60)
     public Object getPrefix() {
         return super.getPrefix();
     }
@@ -150,7 +150,7 @@
      * {@inheritDoc}
      */
     @Override
-    @JsxGetter(FF45)
+    @JsxGetter(FF60)
     public Object getLocalName() {
         return super.getLocalName();
     }
@@ -159,7 +159,7 @@
      * {@inheritDoc}
      */
     @Override
-    @JsxGetter(FF45)
+    @JsxGetter(FF60)
     public Object getNamespaceURI() {
         return super.getNamespaceURI();
     }

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Node.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Node.java	2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Node.java	2018-05-27 11:29:11 UTC (rev 15292)
@@ -19,7 +19,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.FF45;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF52;
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
 
@@ -721,7 +721,7 @@
      * Returns the namespace prefix.
      * @return the namespace prefix
      */
-    @JsxGetter({FF45, IE})
+    @JsxGetter({FF60, IE})
     public Object getPrefix() {
         return getDomNodeOrDie().getPrefix();
     }
@@ -730,7 +730,7 @@
      * Returns the local name of this attribute.
      * @return the local name of this attribute
      */
-    @JsxGetter({FF45, IE})
+    @JsxGetter({FF60, IE})
     public Object getLocalName() {
         return getDomNodeOrDie().getLocalName();
     }
@@ -739,7 +739,7 @@
      * Returns the URI that identifies an XML namespace.
      * @return the URI that identifies an XML namespace
      */
-    @JsxGetter({FF45, IE})
+    @JsxGetter({FF60, IE})
     public Object getNamespaceURI() {
         return getDomNodeOrDie().getNamespaceURI();
     }

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/MozContactChangeEvent.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/MozContactChangeEvent.java	2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/MozContactChangeEvent.java	2018-05-27 11:29:11 UTC (rev 15292)
@@ -14,7 +14,7 @@
  */
 package com.gargoylesoftware.htmlunit.javascript.host.event;
 
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF45;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
 
 import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
 import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstructor;
@@ -24,7 +24,7 @@
  *
  * @author Ahmed Ashour
  */
-@JsxClass(FF45)
+@JsxClass(FF60)
 public class MozContactChangeEvent extends Event {
 
     /**

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/MozSettingsEvent.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/MozSettingsEvent.java	2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/MozSettingsEvent.java	2018-05-27 11:29:11 UTC (rev 15292)
@@ -14,7 +14,7 @@
  */
 package com.gargoylesoftware.htmlunit.javascript.host.event;
 
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF45;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
 
 import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
 import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstructor;
@@ -24,7 +24,7 @@
  *
  * @author Ahmed Ashour
  */
-@JsxClass(FF45)
+@JsxClass(FF60)
 public class MozSettingsEvent extends Event {
 
     /**

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/geo/Geolocation.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/geo/Geolocation.java	2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/geo/Geolocation.java	2018-05-27 11:29:11 UTC (rev 15292)
@@ -147,7 +147,7 @@
                 LOG.info("Invoking URL: " + url);
             }
 
-            try (WebClient webClient = new WebClient(BrowserVersion.FIREFOX_45)) {
+            try (WebClient webClient = new WebClient(BrowserVersion.FIREFOX_60)) {
                 final Page page = webClient.getPage(url);
                 final String content = page.getWebResponse().getContentAsString();
                 if (LOG.isDebugEnabled()) {

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLContentElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLContentElement.java	2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLContentElement.java	2018-05-27 11:29:11 UTC (rev 15292)
@@ -15,7 +15,7 @@
 package com.gargoylesoftware.htmlunit.javascript.host.html;
 
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF45;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
 
 import com.gargoylesoftware.htmlunit.html.HtmlContent;
 import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
@@ -26,7 +26,7 @@
  *
  * @author Ahmed Ashour
  */
-@JsxClass(domClass = HtmlContent.class, value = {CHROME, FF45})
+@JsxClass(domClass = HtmlContent.class, value = {CHROME, FF60})
 public class HTMLContentElement extends HTMLElement {
 
     /**

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElement.java	2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElement.java	2018-05-27 11:29:11 UTC (rev 15292)
@@ -23,7 +23,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.FF45;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF52;
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
 
@@ -173,7 +173,7 @@
 @JsxClass(domClass = HtmlDefinitionTerm.class, value = {CHROME, FF})
 @JsxClass(domClass = HtmlElement.class, value = {FF, IE})
 @JsxClass(domClass = HtmlEmphasis.class, value = {CHROME, FF})
-@JsxClass(domClass = HtmlExample.class, value = FF45)
+@JsxClass(domClass = HtmlExample.class, value = FF60)
 @JsxClass(domClass = HtmlFigure.class)
 @JsxClass(domClass = HtmlFigureCaption.class)
 @JsxClass(domClass = HtmlFooter.class)
@@ -181,7 +181,7 @@
 @JsxClass(domClass = HtmlItalic.class, value = {CHROME, FF})
 @JsxClass(domClass = HtmlKeyboard.class, value = {CHROME, FF})
 @JsxClass(domClass = HtmlLayer.class, value = CHROME)
-@JsxClass(domClass = HtmlListing.class, value = FF45)
+@JsxClass(domClass = HtmlListing.class, value = FF60)
 @JsxClass(domClass = HtmlMark.class)
 @JsxClass(domClass = HtmlNav.class)
 @JsxClass(domClass = HtmlNoBreak.class, value = {CHROME, FF})
@@ -343,7 +343,7 @@
         COLORS_MAP_IE.put("Olive", "#808000");
         COLORS_MAP_IE.put("OliveDrab", "#6B8E23");
         COLORS_MAP_IE.put("Orange", "#FFA500");
-        COLORS_MAP_IE.put("OrangeRed", "#FF4500");
+        COLORS_MAP_IE.put("OrangeRed", "#FF6000");
         COLORS_MAP_IE.put("Orchid", "#DA70D6");
         COLORS_MAP_IE.put("PaleGoldenrod", "#EEE8AA");
         COLORS_MAP_IE.put("PaleGreen", "#98FB98");
@@ -3578,7 +3578,7 @@
      * Returns the {@code onmozpointerlockchange} event handler for this element.
      * @return the {@code onmozpointerlockchange} event handler for this element
      */
-    @JsxGetter(FF45)
+    @JsxGetter(FF60)
     public Function getOnmozpointerlockchange() {
         return getEventHandler("mozpointerlockchange");
     }
@@ -3587,7 +3587,7 @@
      * Sets the {@code onmozpointerlockchange} event handler for this element.
      * @param onmozpointerlockchange the {@code onmozpointerlockchange} event handler for this element
      */
-    @JsxSetter(FF45)
+    @JsxSetter(FF60)
     public void setOnmozpointerlockchange(final Object onmozpointerlockchange) {
         setEventHandler("mozpointerlockchange", onmozpointerlockchange);
     }
@@ -3596,7 +3596,7 @@
      * Returns the {@code onmozpointerlockerror} event handler for this element.
      * @return the {@code onmozpointerlockerror} event handler for this element
      */
-    @JsxGetter(FF45)
+    @JsxGetter(FF60)
     public Function getOnmozpointerlockerror() {
         return getEventHandler("mozpointerlockerror");
     }
@@ -3605,7 +3605,7 @@
      * Sets the {@code onmozpointerlockerror} event handler for this element.
      * @param onmozpointerlockerror the {@code onmozpointerlockerror} event handler for this element
      */
-    @JsxSetter(FF45)
+    @JsxSetter(FF60)
     public void setOnmozpointerlockerror(final Object onmozpointerlockerror) {
         setEventHandler("mozpointerlockerror", onmozpointerlockerror);
     }

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLShadowElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLShadowElement.java	2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLShadowElement.java	2018-05-27 11:29:11 UTC (rev 15292)
@@ -15,7 +15,7 @@
 package com.gargoylesoftware.htmlunit.javascript.host.html;
 
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF45;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
 
 import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
 import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstructor;
@@ -25,7 +25,7 @@
  *
  * @author Ahmed Ashour
  */
-@JsxClass({CHROME, FF45})
+@JsxClass({CHROME, FF60})
 public class HTMLShadowElement extends HTMLElement {
 
     /**

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/moz/MozPowerManager.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/moz/MozPowerManager.java	2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/moz/MozPowerManager.java	2018-05-27 11:29:11 UTC (rev 15292)
@@ -14,7 +14,7 @@
  */
 package com.gargoylesoftware.htmlunit.javascript.host.moz;
 
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF45;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
 
 import com.gargoylesoftware.htmlunit.javascript.SimpleScriptable;
 import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
@@ -25,7 +25,7 @@
  *
  * @author Ahmed Ashour
  */
-@JsxClass(FF45)
+@JsxClass(FF60)
 public class MozPowerManager extends SimpleScriptable {
 
     /**

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGAltGlyphElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGAltGlyphElement.java	2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGAltGlyphElement.java	2018-05-27 11:29:11 UTC (rev 15292)
@@ -14,7 +14,7 @@
  */
 package com.gargoylesoftware.htmlunit.javascript.host.svg;
 
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF45;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
 
 import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
 import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstructor;
@@ -26,7 +26,7 @@
  * @author Ahmed Ashour
  * @author Frank Danek
  */
-@JsxClass(domClass = SvgAltGlyph.class, value = FF45)
+@JsxClass(domClass = SvgAltGlyph.class, value = FF60)
 public class SVGAltGlyphElement extends SVGTextPositioningElement {
 
     /**

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGDocument.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGDocument.java	2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGDocument.java	2018-05-27 11:29:11 UTC (rev 15292)
@@ -14,7 +14,7 @@
  */
 package com.gargoylesoftware.htmlunit.javascript.host.svg;
 
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF45;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
 
 import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
 import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstructor;
@@ -25,7 +25,7 @@
  *
  * @author Ahmed Ashour
  */
-@JsxClass(FF45)
+@JsxClass(FF60)
 public class SVGDocument extends Document {
 
     /**

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGElement.java	2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGElement.java	2018-05-27 11:29:11 UTC (rev 15292)
@@ -17,7 +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.FF45;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF52;
 import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
 
@@ -441,7 +441,7 @@
      * Returns the {@code onmozpointerlockchange} event handler.
      * @return the {@code onmozpointerlockchange} event handler
      */
-    @JsxGetter(FF45)
+    @JsxGetter(FF60)
     public Function getOnmozpointerlockchange() {
         return getEventHandler("mozpointerlockchange");
     }
@@ -450,7 +450,7 @@
      * Sets the {@code onmozpointerlockchange} event handler.
      * @param mozpointerlockchange the {@code onmozpointerlockchange} event handler
      */
-    @JsxSetter(FF45)
+    @JsxSetter(FF60)
     public void setOnmozpointerlockchange(final Object mozpointerlockchange) {
         setEventHandler("mozpointerlockchange", mozpointerlockchange);
     }
@@ -855,7 +855,7 @@
      * Returns the {@code onmozpointerlockerror} event handler.
      * @return the {@code onmozpointerlockerror} event handler
      */
-    @JsxGetter(FF45)
+    @JsxGetter(FF60)
     public Function getOnmozpointerlockerror() {
         return getEventHandler("mozpointerlockerror");
     }
@@ -864,7 +864,7 @@
      * Sets the {@code onmozpointerlockerror} event handler.
      * @param mozpointerlockerror the {@code onmozpointerlockerror} event handler
      */
-    @JsxSetter(FF45)
+    @JsxSetter(FF60)
     public void setOnmozpointerlockerror(final Object mozpointerlockerror) {
         setEventHandler("mozpointerlockerror", mozpointerlockerror);
     }

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserParameterizedRunner.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserParameterizedRunner.java	2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserParameterizedRunner.java	2018-05-27 11:29:11 UTC (rev 15292)
@@ -134,9 +134,9 @@
                     runners_.add(new BrowserVersionClassRunnerWithParameters(
                             klass, BrowserVersion.CHROME, true, tests));
                 }
-                if (browsers.contains("ff45")) {
+                if (browsers.contains("ff60")) {
                     runners_.add(new BrowserVersionClassRunnerWithParameters(
-                            klass, BrowserVersion.FIREFOX_45, true, tests));
+                            klass, BrowserVersion.FIREFOX_60, true, tests));
                 }
                 if (browsers.contains("ff52")) {
                     runners_.add(new BrowserVersionClassRunnerWithParameters(
@@ -156,9 +156,9 @@
                 runners_.add(new BrowserVersionClassRunnerWithParameters(
                         klass, BrowserVersion.CHROME, false, tests));
             }
-            if (browsers.contains("hu-ff45")) {
+            if (browsers.contains("hu_ff60")) {
                 runners_.add(new BrowserVersionClassRunnerWithParameters(
-                        klass, BrowserVersion.FIREFOX_45, false, tests));
+                        klass, BrowserVersion.FIREFOX_60, false, tests));
             }
             if (browsers.contains("hu-ff52")) {
                 runners_.add(new BrowserVersionClassRunnerWithParameters(

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserRunner.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserRunner.java	2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserRunner.java	2018-05-27 11:29:11 UTC (rev 15292)
@@ -77,8 +77,8 @@
                 if (browsers.contains("chrome")) {
                     runners_.add(new BrowserVersionClassRunner(klass, BrowserVersion.CHROME, true));
                 }
-                if (browsers.contains("ff45")) {
-                    runners_.add(new BrowserVersionClassRunner(klass, BrowserVersion.FIREFOX_45, true));
+                if (browsers.contains("ff60")) {
+                    runners_.add(new BrowserVersionClassRunner(klass, BrowserVersion.FIREFOX_60, true));
                 }
                 if (browsers.contains("ff52")) {
                     runners_.add(new BrowserVersionClassRunner(klass, BrowserVersion.FIREFOX_52, true));
@@ -94,8 +94,8 @@
             if (browsers.contains("hu-chrome")) {
                 runners_.add(new BrowserVersionClassRunner(klass, BrowserVersion.CHROME, false));
             }
-            if (browsers.contains("hu-ff45")) {
-                runners_.add(new BrowserVersionClassRunner(klass, BrowserVersion.FIREFOX_45, false));
+            if (browsers.contains("hu-ff60")) {
+                runners_.add(new BrowserVersionClassRunner(klass, BrowserVersion.FIREFOX_60, false));
             }
             if (browsers.contains("hu-ff52")) {
                 runners_.add(new BrowserVersionClassRunner(klass, BrowserVersion.FIREFOX_52, false));
@@ -170,7 +170,7 @@
         FF,
 
         /** Firefox 45. */
-        FF45,
+        FF60,
 
         /** Firefox 52. */
         FF52
@@ -217,7 +217,7 @@
          * Alerts for Firefox 45. If not defined, {@link #FF()} is used.
          * @return the alerts
          */
-        String[] FF45() default { EMPTY_DEFAULT };
+        String[] FF60() default { EMPTY_DEFAULT };
 
         /**
          * Alerts for Firefox 52. If not defined, {@link #FF()} is used.
@@ -275,7 +275,7 @@
          * Alerts for Firefox 45. If not defined, {@link #FF()} is used.
          * @return the alerts
          */
-        String[] FF45() default { EMPTY_DEFAULT };
+        String[] FF60() default { EMPTY_DEFAULT };
 
         /**
          * Alerts for Firefox 52. If not defined, {@link #FF()} is used.

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersion2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersion2Test.java	2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersion2Test.java	2018-05-27 11:29:11 UTC (rev 15292)
@@ -390,7 +390,7 @@
      */
     @Test
     @Alerts(DEFAULT = "Accept: */*",
-            FF45 = "Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8")
+            FF60 = "Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8")
     public void acceptHeaderXMLHttpRequest() throws Exception {
         final String html
             = HtmlPageTest.STANDARDS_MODE_PREFIX_

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersionFeaturesTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersionFeaturesTest.java	2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersionFeaturesTest.java	2018-05-27 11:29:11 UTC (rev 15292)
@@ -65,7 +65,7 @@
     @Test
     public void unusedFeatures() throws Exception {
         final List<BrowserVersion> browsers = new LinkedList<>();
-        browsers.add(BrowserVersion.FIREFOX_45);
+        browsers.add(BrowserVersion.FIREFOX_60);
         browsers.add(BrowserVersion.FIREFOX_52);
         browsers.add(BrowserVersion.INTERNET_EXPLORER);
         browsers.add(BrowserVersion.CHROME);
@@ -112,8 +112,8 @@
         if (browser == BrowserVersion.INTERNET_EXPLORER) {
             return SupportedBrowser.IE;
         }
-        if (browser == BrowserVersion.FIREFOX_45) {
-            return SupportedBrowser.FF45;
+        if (browser == BrowserVersion.FIREFOX_60) {
+            return SupportedBrowser.FF60;
         }
         if (browser == BrowserVersion.FIREFOX_52) {
             return SupportedBrowser.FF52;

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersionTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersionTest.java	2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersionTest.java	2018-05-27 11:29:11 UTC (rev 15292)
@@ -31,7 +31,7 @@
      */
     @Test
     public void getBrowserVersionNumeric() {
-        assertEquals(45, BrowserVersion.FIREFOX_45.getBrowserVersionNumeric());
+        assertEquals(45, BrowserVersion.FIREFOX_60.getBrowserVersionNumeric());
         assertEquals(52, BrowserVersion.FIREFOX_52.getBrowserVersionNumeric());
         assertEquals(11, BrowserVersion.INTERNET_EXPLORER.getBrowserVersionNumeric());
         assertEquals(60, BrowserVersion.CHROME.getBrowserVersionNumeric());

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/CodeStyleTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/CodeStyleTest.java	2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/CodeStyleTest.java	2018-05-27 11:29:11 UTC (rev 15292)
@@ -912,7 +912,7 @@
                 break;
 
             case "FF":
-                if (previousList.contains("FF45") || previousList.contains("FF52")) {
+                if (previousList.contains("FF60") || previousList.contains("FF52")) {
                     addFailure("FF must be before specifc FF version in "
                             + relativePath + ", line: " + (lineIndex + 1));
                 }
@@ -957,7 +957,7 @@
             if (line.startsWith("        CHROME = ")
                     || line.startsWith("        IE = ")
                     || line.startsWith("        FF = ")
-                    || line.startsWith("        FF45 = ")
+                    || line.startsWith("        FF60 = ")
                     || line.startsWith("        FF52 = ")) {
                 addFailure("Incorrect indentation in " + relativePath + ", line: " + (i + 2));
             }

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/HttpWebConnection3Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/HttpWebConnection3Test.java	2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/HttpWebConnection3Test.java	2018-05-27 11:29:11 UTC (rev 15292)
@@ -50,7 +50,7 @@
     @Alerts(CHROME = {HttpHeader.HOST, HttpHeader.CONNECTION, HttpHeader.UPGRADE_INSECURE_REQUESTS,
                         HttpHeader.USER_AGENT,
                         HttpHeader.ACCEPT, HttpHeader.ACCEPT_ENCODING, HttpHeader.ACCEPT_LANGUAGE},
-            FF45 = {HttpHeader.HOST, HttpHeader.USER_AGENT, HttpHeader.ACCEPT, HttpHeader.ACCEPT_LANGUAGE,
+            FF60 = {HttpHeader.HOST, HttpHeader.USER_AGENT, HttpHeader.ACCEPT, HttpHeader.ACCEPT_LANGUAGE,
                         HttpHeader.ACCEPT_ENCODING, HttpHeader.CONNECTION},
             FF52 = {HttpHeader.HOST, HttpHeader.USER_AGENT, HttpHeader.ACCEPT, HttpHeader.ACCEPT_LANGUAGE,
                         HttpHeader.ACCEPT_ENCODING, HttpHeader.CONNECTION, HttpHeader.UPGRADE_INSECURE_REQUESTS},
@@ -97,7 +97,7 @@
                         HttpHeader.USER_AGENT,
                         HttpHeader.ACCEPT, HttpHeader.REFERER, HttpHeader.ACCEPT_ENCODING, HttpHeader.ACCEPT_LANGUAGE,
                         HttpHeader.COOKIE},
-            FF45 = {HttpHeader.HOST, HttpHeader.USER_AGENT, HttpHeader.ACCEPT, HttpHeader.ACCEPT_LANGUAGE,
+            FF60 = {HttpHeader.HOST, HttpHeader.USER_AGENT, HttpHeader.ACCEPT, HttpHeader.ACCEPT_LANGUAGE,
                         HttpHeader.ACCEPT_ENCODING, HttpHeader.REFERER, HttpHeader.COOKIE, HttpHeader.CONNECTION},
             FF52 = {HttpHeader.HOST, HttpHeader.USER_AGENT, HttpHeader.ACCEPT, HttpHeader.ACCEPT_LANGUAGE,
                         HttpHeader.ACCEPT_ENCODING, HttpHeader.REFERER, HttpHeader.COOKIE, HttpHeader.CONNECTION,

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/NotYetImplementedTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/NotYetImplementedTest.java	2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/NotYetImplementedTest.java	2018-05-27 11:29:11 UTC (rev 15292)
@@ -155,7 +155,7 @@
 
         int count = 0;
         int countIE = 0;
-        int countFF45 = 0;
+        int countFF60 = 0;
         int countFF52 = 0;
         int countChrome = 0;
         // int countEdge = 0;
@@ -198,16 +198,16 @@
                 countIE++;
             }
 
-            if (browser.contains("FF45")) {
-                countFF45++;
+            if (browser.contains("FF60")) {
+                countFF60++;
             }
             if (browser.contains("FF52")) {
                 countFF52++;
             }
-            if (!browser.contains("FF45")
+            if (!browser.contains("FF60")
                     && !browser.contains("FF52")
                     && browser.contains("FF")) {
-                countFF45++;
+                countFF60++;
                 countFF52++;
             }
             if (browser.contains("CHROME")) {
@@ -218,7 +218,7 @@
             // }
             if (browser.contains("All")) {
                 countIE++;
-                countFF45++;
+                countFF60++;
                 countFF52++;
                 countChrome++;
                 // countEdge++;
@@ -239,8 +239,8 @@
         overview.append("  </tr>\n");
 
         overview.append("  <tr>\n");
-        overview.append("    <td class='numeric'>").append(Integer.toString(countFF45)).append("</td>\n");
-        overview.append("    <td>for FF45</td>\n");
+        overview.append("    <td class='numeric'>").append(Integer.toString(countFF60)).append("</td>\n");
+        overview.append("    <td>for FF60</td>\n");
         overview.append("  </tr>\n");
 
         overview.append("  <tr>\n");

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebClientTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebClientTest.java	2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebClientTest.java	2018-05-27 11:29:11 UTC (rev 15292)
@@ -1612,7 +1612,7 @@
     @Test
     public void urlEncoding() throws Exception {
         final URL url = new URL("http://host/x+y\u00E9/a\u00E9 b?c \u00E9 d");
-        final HtmlPage page = loadPage(BrowserVersion.FIREFOX_45, "<html></html>", new ArrayList<String>(), url);
+        final HtmlPage page = loadPage(BrowserVersion.FIREFOX_60, "<html></html>", new ArrayList<String>(), url);
         final WebRequest wrs = page.getWebResponse().getWebRequest();
         assertEquals("http://host/x+y%C3%A9/a%C3%A9%20b?c%20%E9%20d", wrs.getUrl());
     }

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebDriverTestCase.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebDriverTestCase.java	2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebDriverTestCase.java	2018-05-27 11:29:11 UTC (rev 15292)
@@ -113,7 +113,7 @@
  *
  *   <li>chrome.bin (mandatory if it does not exist in the <i>path</i>): is the location of the ChromeDriver binary (see
  *   <a href="http://chromedriver.storage.googleapis.com/index.html">Chrome Driver downloads</a>)</li>
- *   <li>ff45.bin (optional): is the location of the FF binary, in Windows use double back-slashes</li>
+ *   <li>ff60.bin (optional): is the location of the FF binary, in Windows use double back-slashes</li>
  *   <li>ff52.bin (optional): is the location of the FF binary, in Windows use double back-slashes</li>
  *   <li>ie.bin (mandatory if it does not exist in the <i>path</i>): is the location of the IEDriverServer binary (see
  *   <a href="http://selenium-release.storage.googleapis.com/index.html">IEDriverServer downloads</a>)</li>
@@ -138,7 +138,7 @@
     /**
      * All browsers supported.
      */
-    public static BrowserVersion[] ALL_BROWSERS_ = {BrowserVersion.CHROME, BrowserVersion.FIREFOX_45,
+    public static BrowserVersion[] ALL_BROWSERS_ = {BrowserVersion.CHROME, BrowserVersion.FIREFOX_60,
         BrowserVersion.FIREFOX_52, BrowserVersion.INTERNET_EXPLORER, BrowserVersion.EDGE};
 
     /**
@@ -145,7 +145,7 @@
      * Browsers which run by default.
      */
     public static BrowserVersion[] DEFAULT_RUNNING_BROWSERS_ =
-        {BrowserVersion.CHROME, BrowserVersion.FIREFOX_45, BrowserVersion.FIREFOX_52, BrowserVersion.INTERNET_EXPLORER};
+        {BrowserVersion.CHROME, BrowserVersion.FIREFOX_60, BrowserVersion.FIREFOX_52, BrowserVersion.INTERNET_EXPLORER};
 
     private static final Log LOG = LogFactory.getLog(WebDriverTestCase.class);
 
@@ -153,7 +153,7 @@
     private static String CHROME_BIN_;
     private static String EDGE_BIN_;
     private static String IE_BIN_;
-    private static String FF45_BIN_;
+    private static String FF60_BIN_;
     private static String FF52_BIN_;
 
     /** The driver cache. */
@@ -205,7 +205,7 @@
                     CHROME_BIN_ = properties.getProperty("chrome.bin");
                     EDGE_BIN_ = properties.getProperty("edge.bin");
                     IE_BIN_ = properties.getProperty("ie.bin");
-                    FF45_BIN_ = properties.getProperty("ff45.bin");
+                    FF60_BIN_ = properties.getProperty("ff60.bin");
                     FF52_BIN_ = properties.getProperty("ff52.bin");
 
                     final boolean autofix = Boolean.parseBoolean(properties.getProperty("autofix"));
@@ -434,14 +434,16 @@
                 return new EdgeDriver();
             }
 
-            if (BrowserVersion.FIREFOX_45 == getBrowserVersion()) {
-                return createFirefoxDriver(FF45_BIN_);
-            }
-
             if (BrowserVersion.FIREFOX_52 == getBrowserVersion()) {
+                // disable the new marionette interface because it requires ff47 or more
+                System.setProperty(FirefoxDriver.SystemProperty.DRIVER_USE_MARIONETTE, "false");
                 return createFirefoxDriver(FF52_BIN_);
             }
 
+            if (BrowserVersion.FIREFOX_60 == getBrowserVersion()) {
+                return createFirefoxDriver(FF60_BIN_);
+            }
+
             throw new RuntimeException("Unexpected BrowserVersion: " + getBrowserVersion());
         }
         if (webDriver_ == null) {
@@ -460,9 +462,6 @@
     }
 
     private static FirefoxDriver createFirefoxDriver(final String binary) {
-        // disable the new marionette interface because it requires ff47 or more
-        System.setProperty(FirefoxDriver.SystemProperty.DRIVER_USE_MARIONETTE, "false");
-
         if (binary != null) {
             final FirefoxOptions options = new FirefoxOptions();
             options.setBinary(binary);
@@ -472,7 +471,7 @@
     }
 
     private static String getBrowserName(final BrowserVersion browserVersion) {
-        if (browserVersion == BrowserVersion.FIREFOX_45) {
+        if (browserVersion == BrowserVersion.FIREFOX_60) {
             return BrowserType.FIREFOX + '-' + browserVersion.getBrowserVersionNumeric();
         }
         else if (browserVersion == BrowserVersion.FIREFOX_52) {

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/ElementDefaultStyleDisplayTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/ElementDefaultStyleDisplayTest.java	2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/ElementDefaultStyleDisplayTest.java	2018-05-27 11:29:11 UTC (rev 15292)
@@ -102,7 +102,7 @@
      */
     @Test
     @Alerts(DEFAULT = {"", "inline"},
-            FF45 = {"block", "inline-block"},
+            FF60 = {"block", "inline-block"},
             FF52 = {"block", "inline"},
             IE = {"inline", "inline"})
     public void applet() throws Exception {
@@ -449,7 +449,7 @@
      */
     @Test
     @Alerts(DEFAULT = {"", "block"},
-            FF45 = {"block", "inline"},
+            FF60 = {"block", "inline"},
             FF52 = {"block", "block"},
             IE = {"inline", "inline"})
     public void details() throws Exception {
@@ -1480,7 +1480,7 @@
      */
     @Test
     @Alerts(DEFAULT = {"", "block"},
-            FF45 = {"block", "inline"},
+            FF60 = {"block", "inline"},
             FF52 = {"block", "block"},
             IE = {"inline", "inline"})
     public void summary() throws Exception {

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/ElementPropertiesTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/ElementPropertiesTest.java	2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/ElementPropertiesTest.java	2018-05-27 11:29:11 UTC (rev 15292)
@@ -17,7 +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.FF45;
+import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.FF60;
 import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.IE;
 import static java.nio.charset.StandardCharsets.ISO_8859_1;
 
@@ -434,7 +434,7 @@
                 + "onratechange,onreset,onresize,onscroll,onseeked,onseeking,onselect,"
                 + "onstalled,onsubmit,onsuspend,ontimeupdate,ontoggle,onvolumechange,onwaiting,onwheel,outerText,"
                 + "spellcheck,style,tabIndex,title,translate",
-            FF45 = "accessKey,accessKeyLabel,blur(),click(),contentEditable,contextMenu,dataset,dir,"
+            FF60 = "accessKey,accessKeyLabel,blur(),click(),contentEditable,contextMenu,dataset,dir,"
                 + "draggable,focus(),hidden,innerText,isContentEditable,itemId,itemProp,itemRef,itemScope,"
                 + "itemType,itemValue,"
                 + "lang,offsetHeight,offsetLeft,offsetParent,offsetTop,offsetWidth,onabort,onblur,oncanplay,"
@@ -533,7 +533,7 @@
                 + "requestPointerLock(),scroll(),scrollBy(),scrollHeight,scrollIntoView(),scrollLeft,scrollLeftMax,"
                 + "scrollTo(),scrollTop,scrollTopMax,scrollWidth,setAttribute(),setAttributeNode(),"
                 + "setAttributeNodeNS(),setAttributeNS(),setCapture(),tagName,webkitMatchesSelector()",
-            FF45 = "attributes,childElementCount,children,classList,className,clientHeight,clientLeft,clientTop,"
+            FF60 = "attributes,childElementCount,children,classList,className,clientHeight,clientLeft,clientTop,"
                 + "clientWidth,closest(),firstElementChild,getAttribute(),getAttributeNames(),getAttributeNode(),"
                 + "getAttributeNodeNS(),getAttributeNS(),getBoundingClientRect(),getClientRects(),"
                 + "getElementsByClassName(),getElementsByTagName(),getElementsByTagNameNS(),hasAttribute(),"
@@ -585,7 +585,7 @@
                 + "setAttributeNode(),"
                 + "setAttributeNodeNS(),setAttributeNS(),setPointerCapture(),shadowRoot,slot,tagName,"
                 + "webkitMatchesSelector(),webkitRequestFullScreen(),webkitRequestFullscreen()",
-            FF45 = "attributes,classList,className,clientHeight,clientLeft,clientTop,"
+            FF60 = "attributes,classList,className,clientHeight,clientLeft,clientTop,"
                 + "clientWidth,closest(),getAttribute(),getAttributeNames(),getAttributeNode(),getAttributeNodeNS(),"
                 + "getAttributeNS(),getBoundingClientRect(),getClientRects(),getElementsByClassName(),"
                 + "getElementsByTagName(),getElementsByTagNameNS(),hasAttribute(),hasAttributeNS(),hasAttributes(),id,"
@@ -645,7 +645,7 @@
                 + "composed,composedPath(),currentTarget,defaultPrevented,eventPhase,initEvent(),isTrusted,"
                 + "NONE,path,preventDefault(),returnValue,srcElement,stopImmediatePropagation(),stopPropagation(),"
                 + "target,timeStamp,type",
-            FF45 = "ALT_MASK,AT_TARGET,bubbles,BUBBLING_PHASE,cancelable,CAPTURING_PHASE,CONTROL_MASK,currentTarget,"
+            FF60 = "ALT_MASK,AT_TARGET,bubbles,BUBBLING_PHASE,cancelable,CAPTURING_PHASE,CONTROL_MASK,currentTarget,"
                 + "defaultPrevented,eventPhase,explicitOriginalTarget,getPreventDefault(),initEvent(),isTrusted,"
                 + "META_MASK,NONE,originalTarget,preventDefault(),SHIFT_MASK,stopImmediatePropagation(),"
                 + "stopPropagation(),target,timeStamp,"
@@ -711,7 +711,7 @@
                 + "webkitRequestAnimationFrame(),webkitRequestFileSystem(),"
                 + "webkitResolveLocalFileSystemURL(),webkitStorageInfo,"
                 + "window",
-            FF45 = "addEventListener(),alert(),applicationCache,atob(),blur(),btoa(),caches,cancelAnimationFrame(),"
+            FF60 = "addEventListener(),alert(),applicationCache,atob(),blur(),btoa(),caches,cancelAnimationFrame(),"
                 + "captureEvents(),clearInterval(),clearTimeout(),close(),closed,confirm(),console,content,"
                 + "createImageBitmap(),crypto,devicePixelRatio,dispatchEvent(),document,dump(),"
                 + "external,fetch(),find(),"
@@ -862,7 +862,7 @@
     @Alerts(DEFAULT = "charset,coords,download,hash,host,hostname,href,hreflang,name,origin,password,pathname,ping,"
                 + "port,protocol,referrerPolicy,rel,relList,rev,search,shape,target,text,type,"
                 + "username",
-            FF45 = "charset,coords,download,hash,host,hostname,href,hreflang,name,origin,password,pathname,ping,"
+            FF60 = "charset,coords,download,hash,host,hostname,href,hreflang,name,origin,password,pathname,ping,"
                 + "port,protocol,rel,relList,rev,search,shape,target,text,type,"
                 + "username",
             IE = "charset,coords,hash,host,hostname,href,hreflang,Methods,mimeType,name,nameProp,pathname,port,"
@@ -914,7 +914,7 @@
     @Test
     @Alerts(DEFAULT = "alt,coords,download,hash,host,hostname,href,noHref,origin,password,pathname,ping,port,"
                 + "protocol,referrerPolicy,rel,relList,search,shape,target,username",
-            FF45 = "alt,coords,download,hash,host,hostname,href,noHref,origin,password,pathname,ping,port,protocol,"
+            FF60 = "alt,coords,download,hash,host,hostname,href,noHref,origin,password,pathname,ping,port,protocol,"
                 + "rel,relList,search,shape,target,username",
             IE = "alt,coords,hash,host,hostname,href,noHref,pathname,port,protocol,rel,search,shape,target",
             EDGE = "alt,coords,hash,host,hostname,href,noHref,pathname,port,protocol,rel,search,shape,target")
@@ -961,7 +961,7 @@
                 + "seekable,seeking,setMediaKeys(),setSinkId(),sinkId,src,srcObject,textTracks,"
                 + "volume,webkitAudioDecodedByteCount,"
                 + "webkitVideoDecodedByteCount",
-            FF45 = "addTextTrack(),autoplay,buffered,canPlayType(),controls,crossOrigin,currentSrc,currentTime,"
+            FF60 = "addTextTrack(),autoplay,buffered,canPlayType(),controls,crossOrigin,currentSrc,currentTime,"
                 + "defaultMuted,defaultPlaybackRate,duration,ended,error,fastSeek(),HAVE_CURRENT_DATA,"
                 + "HAVE_ENOUGH_DATA,HAVE_FUTURE_DATA,HAVE_METADATA,HAVE_NOTHING,load(),loop,mediaKeys,mozAudioCaptured,"
                 + "mozAutoplayEnabled,mozCaptureStream(),"
@@ -1154,7 +1154,7 @@
                 + "formTarget,labels,name,reportValidity(),setCustomValidity(),type,validationMessage,validity,"
                 + "value,"
                 + "willValidate",
-            FF45 = "autofocus,checkValidity(),disabled,form,formAction,formEnctype,formMethod,formNoValidate,"
+            FF60 = "autofocus,checkValidity(),disabled,form,formAction,formEnctype,formMethod,formNoValidate,"
                 + "formTarget,name,setCustomValidity(),type,validationMessage,validity,value,"
                 + "willValidate",
             FF52 = "autofocus,checkValidity(),disabled,form,formAction,formEnctype,formMethod,formNoValidate,"
@@ -1409,7 +1409,7 @@
     @Test
     @Alerts(DEFAULT = "checkValidity(),disabled,elements,form,name,reportValidity(),setCustomValidity(),type,"
                 + "validationMessage,validity,willValidate",
-            FF45 = "checkValidity(),disabled,elements,form,name,setCustomValidity(),type,validationMessage,validity,"
+            FF60 = "checkValidity(),disabled,elements,form,name,setCustomValidity(),type,validationMessage,validity,"
                 + "willValidate",
             IE = "align,checkValidity(),form,setCustomValidity(),validationMessage,validity,willValidate",
             EDGE = "align,checkValidity(),disabled,form,setCustomValidity(),validationMessage,validity,willValidate")
@@ -1460,7 +1460,7 @@
     @Alerts(DEFAULT = "acceptCharset,action,autocomplete,checkValidity(),elements,encoding,enctype,length,method,name,"
                 + "noValidate,reportValidity(),reset(),submit(),"
                 + "target",
-            FF45 = "acceptCharset,action,autocomplete,checkValidity(),elements,encoding,enctype,length,method,name,"
+            FF60 = "acceptCharset,action,autocomplete,checkValidity(),elements,encoding,enctype,length,method,name,"
                 + "noValidate,reset(),submit(),"
                 + "target",
             IE = "acceptCharset,action,autocomplete,checkValidity(),elements,encoding,enctype,item(),length,method,"
@@ -1656,7 +1656,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(FF45 = "align,allowFullscreen,contentDocument,contentWindow,frameBorder,getSVGDocument(),height,"
+    @Alerts(FF60 = "align,allowFullscreen,contentDocument,contentWindow,frameBorder,getSVGDocument(),height,"
                 + "longDesc,marginHeight,marginWidth,name,sandbox,scrolling,src,srcdoc,"
                 + "width",
             FF52 = "align,allowFullscreen,contentDocument,contentWindow,frameBorder,getSVGDocument(),height,"
@@ -1696,7 +1696,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(FF45 = "align,alt,border,complete,crossOrigin,currentSrc,height,hspace,isMap,longDesc,lowsrc,name,"
+    @Alerts(FF60 = "align,alt,border,complete,crossOrigin,currentSrc,height,hspace,isMap,longDesc,lowsrc,name,"
                 + "naturalHeight,naturalWidth,sizes,src,srcset,useMap,vspace,width,x,"
                 + "y",
             FF52 = "align,alt,border,complete,crossOrigin,currentSrc,height,hspace,isMap,longDesc,lowsrc,name,"
@@ -1870,7 +1870,7 @@
     @Test
     @Alerts(CHROME = "as,charset,crossOrigin,disabled,href,hreflang,import,integrity,"
                     + "media,referrerPolicy,rel,relList,rev,sheet,sizes,target,type",
-            FF45 = "charset,crossOrigin,disabled,href,hreflang,integrity,"
+            FF60 = "charset,crossOrigin,disabled,href,hreflang,integrity,"
                     + "media,rel,relList,rev,sheet,sizes,target,type",
             FF52 = "charset,crossOrigin,disabled,href,hreflang,integrity,"
                 + "media,referrerPolicy,rel,relList,rev,sheet,sizes,target,type",
@@ -2090,7 +2090,7 @@
                 + "data,declare,form,"
                 + "getSVGDocument(),height,hspace,name,reportValidity(),setCustomValidity(),standby,type,useMap,"
                 + "validationMessage,validity,vspace,width,willValidate",
-            FF45 = "align,archive,border,checkValidity(),code,codeBase,codeType,contentDocument,contentWindow,data,"
+            FF60 = "align,archive,border,checkValidity(),code,codeBase,codeType,contentDocument,contentWindow,data,"
                 + "declare,form,getSVGDocument(),height,hspace,name,setCustomValidity(),standby,type,typeMustMatch,"
                 + "useMap,validationMessage,validity,vspace,width,willValidate",
             FF52 = "align,archive,border,checkValidity(),code,codeBase,codeType,contentDocument,contentWindow,data,"
@@ -2159,7 +2159,7 @@
     @Alerts(DEFAULT = "checkValidity(),defaultValue,form,htmlFor,labels,name,reportValidity(),setCustomValidity(),type,"
                 + "validationMessage,validity,value,"
                 + "willValidate",
-            FF45 = "checkValidity(),defaultValue,form,htmlFor,name,setCustomValidity(),type,validationMessage,"
+            FF60 = "checkValidity(),defaultValue,form,htmlFor,name,setCustomValidity(),type,validationMessage,"
                 + "validity,value,"
                 + "willValidate",
             FF52 = "checkValidity(),defaultValue,form,htmlFor,name,reportValidity(),setCustomValidity(),"
@@ -2336,7 +2336,7 @@
                 + "options,reportValidity(),required,selectedIndex,selectedOptions,setCustomValidity(),size,type,"
                 + "validationMessage,validity,value,"
                 + "willValidate",
-            FF45 = "add(),autofocus,checkValidity(),disabled,form,item(),length,multiple,name,"
+            FF60 = "add(),autofocus,checkValidity(),disabled,form,item(),length,multiple,name,"
                 + "namedItem(),options,required,selectedIndex,selectedOptions,setCustomValidity(),size,type,"
                 + "validationMessage,validity,value,"
                 + "willValidate",
@@ -2595,7 +2595,7 @@
                 + "selectionDirection,selectionEnd,selectionStart,setCustomValidity(),setRangeText(),"
                 + "setSelectionRange(),textLength,type,validationMessage,validity,value,willValidate,"
                 + "wrap",
-            FF45 = "autofocus,checkValidity(),cols,defaultValue,disabled,form,maxLength,name,placeholder,readOnly,"
+            FF60 = "autofocus,checkValidity(),cols,defaultValue,disabled,form,maxLength,name,placeholder,readOnly,"
                 + "required,rows,select(),selectionDirection,selectionEnd,selectionStart,setCustomValidity(),"
                 + "setRangeText(),setSelectionRange(),textLength,type,validationMessage,validity,value,willValidate,"
                 + "wrap",
@@ -2743,7 +2743,7 @@
                 + "webkitEnterFullscreen(),webkitEnterFullScreen(),"
                 + "webkitExitFullScreen(),webkitExitFullscreen(),webkitSupportsFullscreen,webkitVideoDecodedByteCount,"
                 + "width",
-            FF45 = "addTextTrack(),autoplay,buffered,canPlayType(),controls,crossOrigin,currentSrc,currentTime,"
+            FF60 = "addTextTrack(),autoplay,buffered,canPlayType(),controls,crossOrigin,currentSrc,currentTime,"
                 + "defaultMuted,defaultPlaybackRate,duration,ended,error,fastSeek(),getVideoPlaybackQuality(),"
                 + "HAVE_CURRENT_DATA,"
                 + "HAVE_ENOUGH_DATA,HAVE_FUTURE_DATA,HAVE_METADATA,HAVE_NOTHING,height,load(),loop,mediaKeys,"
@@ -2809,7 +2809,7 @@
      */
     @Test
     @Alerts(DEFAULT = "width",
-            FF45 = "-",
+            FF60 = "-",
             IE = "cite,clear,width")
     @NotYetImplemented(EDGE)
     public void xmp() throws Exception {
@@ -2822,7 +2822,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(FF45 = "accept,align,alt,autocomplete,autofocus,checked,checkValidity(),defaultChecked,defaultValue,"
+    @Alerts(FF60 = "accept,align,alt,autocomplete,autofocus,checked,checkValidity(),defaultChecked,defaultValue,"
                 + "disabled,files,form,formAction,formEnctype,formMethod,formNoValidate,formTarget,height,"
                 + "indeterminate,list,max,maxLength,min,mozIsTextField(),multiple,name,pattern,placeholder,readOnly,"
                 + "required,select(),selectionDirection,selectionEnd,selectionStart,setCustomValidity(),"
@@ -2881,8 +2881,8 @@
     @Test
     @Alerts(DEFAULT = "-",
             CHROME = "getDistributedNodes(),select",
-            FF45 = "getDistributedNodes(),select")
-    @NotYetImplemented({CHROME, FF45})
+            FF60 = "getDistributedNodes(),select")
+    @NotYetImplemented({CHROME, FF60})
     public void content() throws Exception {
         test("content");
     }
@@ -2974,7 +2974,7 @@
      */
     @Test
     @Alerts(CHROME = "detail,initUIEvent(),sourceCapabilities,view,which",
-            FF45 = "cancelBubble,detail,initUIEvent(),isChar,layerX,layerY,pageX,pageY,rangeOffset,rangeParent,"
+            FF60 = "cancelBubble,detail,initUIEvent(),isChar,layerX,layerY,pageX,pageY,rangeOffset,rangeParent,"
                 + "SCROLL_PAGE_DOWN,SCROLL_PAGE_UP,view,which",
             FF52 = "detail,initUIEvent(),isChar,layerX,layerY,pageX,pageY,rangeOffset,rangeParent,"
                 + "SCROLL_PAGE_DOWN,SCROLL_PAGE_UP,view,which",
@@ -3004,7 +3004,7 @@
      */
     @Test
     @Alerts(DEFAULT = "-",
-            FF45 = "alinkColor,all,anchors,applets,bgColor,body,captureEvents(),clear(),close(),cookie,designMode,"
+            FF60 = "alinkColor,all,anchors,applets,bgColor,body,captureEvents(),clear(),close(),cookie,designMode,"
                 + "domain,"
                 + "embeds,execCommand(),fgColor,forms,getElementsByName(),getItems(),getSelection(),head,images,"
                 + "linkColor,links,"
@@ -3060,7 +3060,7 @@
                 + "webkitCancelFullScreen(),webkitCurrentFullScreenElement,webkitExitFullscreen(),"
                 + "webkitFullscreenElement,webkitFullscreenEnabled,webkitHidden,webkitIsFullScreen,"
                 + "webkitVisibilityState,write(),writeln(),xmlEncoding,xmlStandalone,xmlVersion",
-            FF45 = "activeElement,adoptNode(),async,caretPositionFromPoint(),characterSet,charset,childElementCount,"
+            FF60 = "activeElement,adoptNode(),async,caretPositionFromPoint(),characterSet,charset,childElementCount,"
                 + "children,compatMode,contentType,createAttribute(),createAttributeNS(),createCDATASection(),"
                 + "createComment(),createDocumentFragment(),createElement(),createElementNS(),createEvent(),"
                 + "createExpression(),createNodeIterator(),createNSResolver(),createProcessingInstruction(),"
@@ -3157,7 +3157,7 @@
                 + "onsubmit,onsuspend,ontimeupdate,ontoggle,onvolumechange,onwaiting,onwheel,"
                 + "ownerSVGElement,style,tabIndex,"
                 + "viewportElement",
-            FF45 = "onabort,onblur,oncanplay,oncanplaythrough,onchange,onclick,oncontextmenu,oncopy,oncut,ondblclick,"
+            FF60 = "onabort,onblur,oncanplay,oncanplaythrough,onchange,onclick,oncontextmenu,oncopy,oncut,ondblclick,"
                 + "ondrag,ondragend,ondragenter,ondragleave,ondragover,ondragstart,ondrop,ondurationchange,"
                 + "onemptied,onended,onerror,onfocus,oninput,oninvalid,onkeydown,onkeypress,onkeyup,onload,"
                 + "onloadeddata,onloadedmetadata,onloadstart,onmousedown,onmouseenter,onmouseleave,onmousemove,"
@@ -3195,7 +3195,7 @@
                 + "nodeType,nodeValue,normalize(),NOTATION_NODE,ownerDocument,ownerElement,parentElement,parentNode,"
                 + "prefix,previousSibling,PROCESSING_INSTRUCTION_NODE,removeChild(),replaceChild(),specified,TEXT_NODE,"
                 + "textContent,value",
-            FF45 = "addEventListener(),appendChild(),ATTRIBUTE_NODE,baseURI,CDATA_SECTION_NODE,childNodes,cloneNode(),"
+            FF60 = "addEventListener(),appendChild(),ATTRIBUTE_NODE,baseURI,CDATA_SECTION_NODE,childNodes,cloneNode(),"
                 + "COMMENT_NODE,compareDocumentPosition(),contains(),dispatchEvent(),DOCUMENT_FRAGMENT_NODE,"
                 + "DOCUMENT_NODE,DOCUMENT_POSITION_CONTAINED_BY,DOCUMENT_POSITION_CONTAINS,"
                 + "DOCUMENT_POSITION_DISCONNECTED,DOCUMENT_POSITION_FOLLOWING,"
@@ -3273,7 +3273,7 @@
                 + "nodeType,nodeValue,normalize(),NOTATION_NODE,ownerDocument,parentElement,parentNode,prepend(),"
                 + "previousSibling,PROCESSING_INSTRUCTION_NODE,querySelector(),querySelectorAll(),removeChild(),"
                 + "replaceChild(),TEXT_NODE,textContent",
-            FF45 = "addEventListener(),appendChild(),ATTRIBUTE_NODE,baseURI,CDATA_SECTION_NODE,"
+            FF60 = "addEventListener(),appendChild(),ATTRIBUTE_NODE,baseURI,CDATA_SECTION_NODE,"
                 + "childElementCount,childNodes,children,cloneNode(),COMMENT_NODE,compareDocumentPosition(),contains(),"
                 + "dispatchEvent(),DOCUMENT_FRAGMENT_NODE,DOCUMENT_NODE,DOCUMENT_POSITION_CONTAINED_BY,"
                 + "DOCUMENT_POSITION_CONTAINS,DOCUMENT_POSITION_DISCONNECTED,DOCUMENT_POSITION_FOLLOWING,"

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/HostClassNameTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/HostClassNameTest.java	2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/HostClassNameTest.java	2018-05-27 11:29:11 UTC (rev 15292)
@@ -1312,7 +1312,7 @@
     @Test
     @Alerts(DEFAULT = "[object CSSKeyframeRule]",
             CHROME = "function CSSKeyframeRule() { [native code] }",
-            FF45 = "exception")
+            FF60 = "exception")
     public void cssKeyframeRule() throws Exception {
         test("CSSKeyframeRule");
     }
@@ -1322,7 +1322,7 @@
      */
     @Test
     @Alerts(DEFAULT = "function CSSKeyframesRule() { [native code] }",
-            FF45 = "exception",
+            FF60 = "exception",
             FF52 = "[object CSSKeyframesRule]",
             IE = "[object CSSKeyframesRule]")
     public void cssKeyframesRule() throws Exception {
@@ -3152,7 +3152,7 @@
     @Test
     @Alerts(DEFAULT = "exception",
             CHROME = "function HTMLContentElement() { [native code] }",
-            FF45 = "function HTMLContentElement() {\n    [native code]\n}")
+            FF60 = "function HTMLContentElement() {\n    [native code]\n}")
     public void htmlContentElement() throws Exception {
         test("HTMLContentElement");
     }
@@ -3936,7 +3936,7 @@
     @Test
     @Alerts(DEFAULT = "exception",
             CHROME = "function HTMLShadowElement() { [native code] }",
-            FF45 = "function HTMLShadowElement() {\n    [native code]\n}")
+            FF60 = "function HTMLShadowElement() {\n    [native code]\n}")
     public void htmlShadowElement() throws Exception {
         test("HTMLShadowElement");
     }
@@ -5532,7 +5532,7 @@
      */
     @Test
     @Alerts(DEFAULT = "exception",
-            FF45 = "function MozContactChangeEvent() {\n    [native code]\n}")
+            FF60 = "function MozContactChangeEvent() {\n    [native code]\n}")
     public void mozContactChangeEvent() throws Exception {
         test("MozContactChangeEvent");
     }
@@ -5542,7 +5542,7 @@
      */
     @Test
     @Alerts(DEFAULT = "exception",
-            FF45 = "[object MozCSSKeyframesRule]")
+            FF60 = "[object MozCSSKeyframesRule]")
     public void mozCSSKeyframesRule() throws Exception {
         test("MozCSSKeyframesRule");
     }
@@ -5714,7 +5714,7 @@
      */
     @Test
     @Alerts(DEFAULT = "exception",
-            FF45 = "function MozPowerManager() {\n    [native code]\n}")
+            FF60 = "function MozPowerManager() {\n    [native code]\n}")
     public void mozPowerManager() throws Exception {
         test("MozPowerManager");
     }
@@ -5754,7 +5754,7 @@
      */
     @Test
     @Alerts(DEFAULT = "exception",
-            FF45 = "function MozSettingsEvent() {\n    [native code]\n}")
+            FF60 = "function MozSettingsEvent() {\n    [native code]\n}")
     public void mozSettingsEvent() throws Exception {
         test("MozSettingsEvent");
     }
@@ -8001,7 +8001,7 @@
      */
     @Test
     @Alerts(DEFAULT = "exception",
-            FF45 = "function SVGAltGlyphElement() {\n    [native code]\n}")
+            FF60 = "function SVGAltGlyphElement() {\n    [native code]\n}")
     public void svgAltGlyphElement() throws Exception {
         test("SVGAltGlyphElement");
     }
@@ -8306,7 +8306,7 @@
      */
     @Test
     @Alerts(DEFAULT = "exception",
-            FF45 = "function SVGDocument() {\n    [native code]\n}")
+            FF60 = "function SVGDocument() {\n    [native code]\n}")
     public void svgDocument() throws Exception {
         test("SVGDocument");
     }
@@ -10482,7 +10482,7 @@
      */
     @Test
     @Alerts(DEFAULT = "function WebGLContextEvent() { [native code] }",
-            FF45 = "exception",
+            FF60 = "exception",
             IE = "\nfunction WebGLContextEvent() {\n    [native code]\n}\n",
             FF52 = "function WebGLContextEvent() {\n    [native code]\n}")
     public void webGLContextEvent() throws Exception {

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/HostTypeOfTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/HostTypeOfTest.java	2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/HostTypeOfTest.java	2018-05-27 11:29:11 UTC (rev 15292)
@@ -3786,7 +3786,7 @@
      */
     @Test
     @Alerts(DEFAULT = "undefined",
-            FF45 = "function")
+            FF60 = "function")
     public void mozContactChangeEvent() throws Exception {
         test("MozContactChangeEvent");
     }
@@ -3796,7 +3796,7 @@
      */
     @Test
     @Alerts(DEFAULT = "undefined",
-            FF45 = "object")
+            FF60 = "object")
     public void mozCSSKeyframesRule() throws Exception {
         test("MozCSSKeyframesRule");
     }
@@ -3842,7 +3842,7 @@
      */
     @Test
     @Alerts(DEFAULT = "undefined",
-            FF45 = "function")
+            FF60 = "function")
     public void mozPowerManager() throws Exception {
         test("MozPowerManager");
     }
@@ -3882,7 +3882,7 @@
      */
     @Test
     @Alerts(DEFAULT = "undefined",
-            FF45 = "function")
+            FF60 = "function")
     public void mozSettingsEvent() throws Exception {
         test("MozSettingsEvent");
     }
@@ -5266,7 +5266,7 @@
      */
     @Test
     @Alerts(DEFAULT = "undefined",
-            FF45 = "function")
+            FF60 = "function")
     public void svgAltGlyphElement() throws Exception {
         test("SVGAltGlyphElement");
     }
@@ -5531,7 +5531,7 @@
      */
     @Test
     @Alerts(DEFAULT = "undefined",
-            FF45 = "function")
+            FF60 = "function")
     public void svgDocument() throws Exception {
         test("SVGDocument");
     }
@@ -7141,7 +7141,7 @@
      */
     @Test
     @Alerts(DEFAULT = "function",
-            FF45 = "undefined")
+            FF60 = "undefined")
     public void webGLContextEvent() throws Exception {
         test("WebGLContextEvent");
     }

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFileInputTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFileInputTest.java	2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFileInputTest.java	2018-05-27 11:29:11 UTC (rev 15292)
@@ -255,7 +255,7 @@
      */
     @Test
     @Alerts(DEFAULT = {"CONTENT_TYPE:audio/flac", "charset"},
-            FF45 = {"CONTENT_TYPE:audio/x-flac", "charset"},
+            FF60 = {"CONTENT_TYPE:audio/x-flac", "charset"},
             FF52 = {"CONTENT_TYPE:application/octet-stream", "charset"},
             IE = {"CONTENT_TYPE:application/octet-stream", "charset"})
     public void contentTypeFlac() throws Exception {
@@ -864,7 +864,7 @@
     @Alerts(DEFAULT = {"null,null", "exception value", "null,null",
                         "exception", "null,null",
                         "exception", "null,null"},
-            FF45 = {"exception", "exception value", "exception",
+            FF60 = {"exception", "exception value", "exception",
                         "exception", "exception",
                         "exception", "exception"},
             IE = {"exception", "exception",
@@ -881,7 +881,7 @@
     @Alerts(DEFAULT = {"null,null", "exception value", "null,null",
                         "exception", "null,null",
                         "exception", "null,null"},
-            FF45 = {"exception", "exception value", "exception",
+            FF60 = {"exception", "exception value", "exception",
                         "exception", "exception",
                         "exception", "exception"},
             IE = {"exception", "exception",
@@ -898,7 +898,7 @@
     @Alerts(DEFAULT = {"null,null", "exception value", "null,null",
                         "exception", "null,null",
                         "exception", "null,null"},
-            FF45 = {"exception", "exception value", "exception",
+            FF60 = {"exception", "exception value", "exception",
                         "exception", "exception",
                         "exception", "exception"},
             IE = {"exception", "exception",

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/DebugFrameImplTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/DebugFrameImplTest.java	2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/DebugFrameImplTest.java	2018-05-27 11:29:11 UTC (rev 15292)
@@ -52,7 +52,7 @@
      * @throws Exception if an exception occurs
      */
     public DebugFrameImplTest() throws Exception {
-        client_ = new WebClient(BrowserVersion.FIREFOX_45);
+        client_ = new WebClient(BrowserVersion.FIREFOX_60);
         ((JavaScriptEngine) client_.getJavaScriptEngine()).getContextFactory().setDebugger(new DebuggerImpl());
         originalLogLevel_ = loggerDebugFrameImpl_.getLevel();
         loggerDebugFrameImpl_.setLevel(Level.TRACE);

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine2Test.java	2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine2Test.java	2018-05-27 11:29:11 UTC (rev 15292)
@@ -123,7 +123,7 @@
      */
     @Test
     @Alerts(DEFAULT = {"in goo", "in hoo", "in foo"},
-            FF45 = {"in goo", "in hoo", "foo error"})
+            FF60 = {"in goo", "in hoo", "foo error"})
     public void functionDeclaredForwardInBlock() throws Exception {
         final String html = "<html><head></head><body>\n"
             + "<script>\n"
@@ -152,7 +152,7 @@
     @Alerts(DEFAULT = {"function foo() {}", "function foo() {}"},
             CHROME = {"undefined", "function foo() {}"},
             FF52 = {"undefined", "function foo() {}"},
-            FF45 = {"undefined", "foo error"})
+            FF60 = {"undefined", "foo error"})
     @NotYetImplemented({IE, CHROME, FF52})
     public void variableNotDefined() throws Exception {
         final String html = "<html><head></head><body>\n"

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/NativeArrayTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/NativeArrayTest.java	2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/NativeArrayTest.java	2018-05-27 11:29:11 UTC (rev 15292)
@@ -14,7 +14,7 @@
  */
 package com.gargoylesoftware.htmlunit.javascript;
 
-import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.FF45;
+import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.FF60;
 import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.IE;
 
 import org.junit.Test;
@@ -43,9 +43,9 @@
      */
     @Test
     @Alerts(DEFAULT = {"1<>5", "5<>2", "1<>2", "5<>1", "2<>1", "1<>1", "5<>9"},
-            FF45 = {"1<>5", "5<>2", "1<>2", "1<>9", "5<>1", "1<>1", "2<>1", "2<>9", "5<>9"},
+            FF60 = {"1<>5", "5<>2", "1<>2", "1<>9", "5<>1", "1<>1", "2<>1", "2<>9", "5<>9"},
             IE = {"5<>1", "2<>5", "2<>1", "2<>5", "1<>5", "1<>2", "1<>1", "9<>5"})
-    @NotYetImplemented({FF45, IE})
+    @NotYetImplemented({FF60, IE})
     public void sortSteps() throws Exception {
         final String html
             = "<html><head><title>foo</title><script>\n"

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/NativeStringTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/NativeStringTest.java	2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/NativeStringTest.java	2018-05-27 11:29:11 UTC (rev 15292)
@@ -81,7 +81,7 @@
     @Test
     @Alerts(DEFAULT = {"contains: undefined", "toSource: undefined", "trim: function"},
             FF52 = {"contains: undefined", "toSource: function", "trim: function"},
-            FF45 = {"contains: function", "toSource: function", "trim: function"})
+            FF60 = {"contains: function", "toSource: function", "trim: function"})
     public void methods_differences() throws Exception {
         final String[] methods = {"contains", "toSource", "trim" };
         final String html = NativeDateTest.createHTMLTestMethods("'hello'", methods);
@@ -158,7 +158,7 @@
      */
     @Test
     @Alerts(DEFAULT = "contains not supported",
-            FF45 = {"true", "false", "true", "true", "true", "false", "true", "true", "true", "false",
+            FF60 = {"true", "false", "true", "true", "true", "false", "true", "true", "true", "false",
                         "true", "true", "false", "false"})
     public void contains() throws Exception {
         final String html

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/configuration/JavaScriptConfigurationTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/configuration/JavaScriptConfigurationTest.java	2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/configuration/JavaScriptConfigurationTest.java	2018-05-27 11:29:11 UTC (rev 15292)
@@ -16,7 +16,7 @@
 
 import static com.gargoylesoftware.htmlunit.BrowserVersion.CHROME;
 import static com.gargoylesoftware.htmlunit.BrowserVersion.EDGE;
-import static com.gargoylesoftware.htmlunit.BrowserVersion.FIREFOX_45;
+import static com.gargoylesoftware.htmlunit.BrowserVersion.FIREFOX_60;
 import static com.gargoylesoftware.htmlunit.BrowserVersion.FIREFOX_52;
 import static com.gargoylesoftware.htmlunit.BrowserVersion.INTERNET_EXPLORER;
 import static org.junit.Assert.fail;
@@ -276,9 +276,9 @@
      */
     @Test
     public void obsoleteJsxClasses() {
-        final JavaScriptConfiguration config = JavaScriptConfiguration.getInstance(FIREFOX_45);
+        final JavaScriptConfiguration config = JavaScriptConfiguration.getInstance(FIREFOX_60);
         final BrowserVersion[] browsers = new BrowserVersion[]
-        {FIREFOX_45, FIREFOX_52, CHROME, INTERNET_EXPLORER, EDGE};
+        {FIREFOX_60, FIREFOX_52, CHROME, INTERNET_EXPLORER, EDGE};
 
         for (final Class<? extends SimpleScriptable> klass : config.getClasses()) {
             boolean found = false;
@@ -342,7 +342,7 @@
      */
     @Test
     public void cloned() throws Exception {
-        final BrowserVersion browserVersion = new BrowserVersion.BrowserVersionBuilder(BrowserVersion.FIREFOX_45)
+        final BrowserVersion browserVersion = new BrowserVersion.BrowserVersionBuilder(BrowserVersion.FIREFOX_60)
                                                     .build();
 
         test(browserVersion);
@@ -355,7 +355,7 @@
      */
     @Test
     public void clonedAndModified() throws Exception {
-        final BrowserVersion browserVersion = new BrowserVersion.BrowserVersionBuilder(BrowserVersion.FIREFOX_45)

@@ Diff output truncated at 100000 characters. @@

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.